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

do class scoping the right way (no direct access to class stuff in methods)

Browse Source
This commit is contained in:
David Halter
2012-05-28 02:10:42 +02:00
parent 5f0926d045
commit 1661196701
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
evaluate.py
View File

@@ -93,7 +93,7 @@ class Instance(Executable):
else:
return func
def get_subscope(self, name):
def get_subscope_by_name(self, name):
for sub in reversed(self.base.subscopes):
if sub.name.get_code() == name:
return sub
@@ -307,7 +307,7 @@ class Execution(Executable):
else:
try:
# if it is an instance, we try to execute the __call__().
call_method = self.base.get_subscope('__call__')
call_method = self.base.get_subscope_by_name('__call__')
except (AttributeError, KeyError):
debug.warning("no execution possible", self.base)
else:
@@ -701,9 +701,10 @@ def get_names_for_scope(scope, position=None, star_search=True):
"""
start_scope = scope
while scope:
# class variables/functions are only available
if (not isinstance(scope, Class) or scope == start_scope) \
and not isinstance(scope, parsing.Flow):
# `parsing.Class` is used, because the parent is never `Class`.
# ignore the Flows, because the classes and functions care for that.
if not (scope != start_scope and isinstance(scope, (parsing.Class))
or isinstance(scope, parsing.Flow)):
try:
yield scope, get_defined_names_for_position(scope, position)
except StopIteration: