VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

cleanup and last fixes -> fixes #68

Browse Source
This commit is contained in:
David Halter
2012-11-24 02:57:32 +01:00
parent 7be9b8d923
commit 4df89f0272
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate.py
View File

@@ -508,7 +508,6 @@ class Execution(Executable):
# otherwise it would be a metaclass # otherwise it would be a metaclass
if len(self.var_args) == 1: if len(self.var_args) == 1:
objects = follow_call_list([self.var_args[0]]) objects = follow_call_list([self.var_args[0]])
print 'LALA', objects, [o.base for o in objects if isinstance(o, Instance)]
return [o.base for o in objects if isinstance(o, Instance)] return [o.base for o in objects if isinstance(o, Instance)]
if self.base.isinstance(Class): if self.base.isinstance(Class):
@@ -734,19 +733,22 @@ class Execution(Executable):
@memoize_default() @memoize_default()
def _scope_copy(self, scope): def _scope_copy(self, scope):
try: try:
""" Copies a scope (e.g. if) in an execution """ """ Copies a scope (e.g. if) in an execution """
# TODO This method uses different scopes than the subscopes property. # TODO method uses different scopes than the subscopes property.
if scope == self.base or scope == self.base.base_func:
return self # just check the start_pos, sometimes it's difficult with closures
else: # to compare the scopes directly.
if scope.start_pos == self.start_pos:
return self
else:
copied = helpers.fast_parent_copy(scope) copied = helpers.fast_parent_copy(scope)
#copied.parent = self._scope_copy(copied.parent()) #copied.parent = self._scope_copy(copied.parent())
copied.parent = weakref.ref(self._scope_copy(copied.parent())) copied.parent = weakref.ref(self._scope_copy(copied.parent()))
#copied.parent = weakref.ref(self) #copied.parent = weakref.ref(self)
faked_scopes.append(copied) faked_scopes.append(copied)
return copied return copied
except AttributeError: except AttributeError:
raise MultiLevelAttributeError(sys.exc_info()) raise MultiLevelAttributeError(sys.exc_info())