VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests and error catching for double executions

Browse Source
This commit is contained in:
David Halter
2012-04-25 10:01:53 +02:00
parent 3780e44603
commit e466508b4d
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
evaluate.py
View File

@@ -115,14 +115,17 @@ class Execution(Exec):
else:
# set the callback function to get the params
self.base.param_cb = self.get_params
ret = self.base.returns
for s in ret:
#temp, s.parent = s.parent, self
stmts += follow_statement(s)
#s.parent = temp
# don't do this with exceptions, as usual, because some deeper
# exceptions could be catched - and I wouldn't know what happened.
if hasattr(self.base, 'returns'):
ret = self.base.returns
for s in ret:
#temp, s.parent = s.parent, self
stmts += follow_statement(s)
#s.parent = temp
# reset the callback function on exit
self.base.param_cb = None
# reset the callback function on exit
self.base.param_cb = None
debug.dbg('exec stmts=', stmts, self.base, repr(self))
@@ -432,11 +435,15 @@ def follow_call(scope, call):
else:
# TODO add better care for int/unicode, now str/float are just used
# instead
not_name_part = not isinstance(current, parsing.NamePart)
if not_name_part and current.type == parsing.Call.STRING:
scopes = get_scopes_for_name(builtin.Builtin.scope, 'str')
elif not_name_part and current.type == parsing.Call.NUMBER:
scopes = get_scopes_for_name(builtin.Builtin.scope, 'float')
if not isinstance(current, parsing.NamePart):
if current.type == parsing.Call.STRING:
scopes = get_scopes_for_name(builtin.Builtin.scope, 'str')
elif current.type == parsing.Call.NUMBER:
scopes = get_scopes_for_name(builtin.Builtin.scope, 'float')
else:
debug.warning('unknown type:', current.type, current)
# make instances of those number/string objects
scopes = [Instance(s) for s in scopes]
else:
scopes = get_scopes_for_name(scope, current, search_global=True)
result = strip_imports(scopes)