Small improvments to from imports

This commit is contained in:
Dave Halter
2014-11-18 18:43:16 +01:00
parent 9d5f3162d7
commit 535a69e499
4 changed files with 11 additions and 8 deletions
+2 -2
View File
@@ -45,6 +45,7 @@ class ImportWrapper():
self._name = name
self._import = name.get_parent_until(pr.Import)
self.import_path = self._import.path_for_name(name)
@memoize_default()
def follow(self, is_goto=False):
@@ -99,8 +100,7 @@ class ImportWrapper():
for s in scopes))
debug.dbg('after import: %s', scopes)
if not scopes:
analysis.add(self._evaluator, 'import-error',
self._importer.import_path[-1])
analysis.add(self._evaluator, 'import-error', importer.import_path[-1])
finally:
self._evaluator.recursion_detector.pop_stmt()
return scopes
+1 -1
View File
@@ -731,7 +731,7 @@ class ModuleWrapper(use_metaclass(CachedMetaClass, pr.Module, Wrapper)):
@property
@memoize_default()
def name(self):
return pr.Name(self, unicode(self.base.name), self, (1, 0))
return helpers.FakeName(unicode(self.base.name), self)
@memoize_default()
def _sub_modules(self):