more consequent usage of scope_names_generator

This commit is contained in:
Dave Halter
2014-07-03 11:41:33 +02:00
parent a7e4d81692
commit ea370a083d
4 changed files with 11 additions and 9 deletions
+1 -3
View File
@@ -67,8 +67,6 @@ class NameFinder(object):
return get_names_of_scope(self._evaluator, self.scope, self.position)
else:
try:
# Use scope generators if parts of it (e.g. sub classes or star
# imports).
gen = self.scope.scope_names_generator
except AttributeError:
if isinstance(self.scope, er.Class):
@@ -79,7 +77,7 @@ class NameFinder(object):
names = _get_defined_names_for_position(self.scope, self.position)
return iter([(self.scope, names)])
else:
return gen()
return gen(self.position)
def filter_name(self, scope_names_generator):
"""