mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-05 17:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'adqm-completer_execution'

Browse source
This commit is contained in:
Anthony Scopatz 2015-11-29 13:13:38 -05:00
commit 4da6900b1c
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xonsh/completer.py
View file

@ -378,14 +378,25 @@ class Completer(object):
expr = subexpr_from_unbalanced(expr, '(', ')')
expr = subexpr_from_unbalanced(expr, '[', ']')
expr = subexpr_from_unbalanced(expr, '{', '}')
_ctx = None
try:
val = builtins.evalx(expr, glbs=ctx)
val = eval(expr, ctx)
_ctx = ctx
except: # pylint:disable=bare-except
try:
val = builtins.evalx(expr, glbs=builtins.__dict__)
val = eval(expr, builtins.__dict__)
_ctx = builtins.__dict__
except: # pylint:disable=bare-except
return attrs # anything could have gone wrong!
opts = dir(val)
_opts = dir(val)
# check whether these options actually work (e.g., disallow 7.imag)
opts = []
for i in _opts:
try:
v = eval('{0}.{1}'.format(expr, i), _ctx)
opts.append(i)
except: # pylint:disable=bare-except
continue
if len(attr) == 0:
opts = [o for o in opts if not o.startswith('_')]
else: