Merge branch 'dev' of github.com:davidhalter/jedi into dev

2014-10-06 17:55:46 +02:00
parent e9a3a44780 90d159eadd
commit 09a7317bc9
2 changed files with 11 additions and 1 deletions
@@ -190,6 +190,9 @@ class ImportWrapper(pr.Base):
                    analysis.add(self._evaluator, 'import-error', e.name_part)
                    return []

+                if module is None:
+                    return []
+
                if self.import_stmt.is_nested() and not self.nested_resolve:
                    scopes = [NestedImportModule(module, self.import_stmt)]
                else: