Don't export imported modules in stubs unless using 'as'

JukkaL · JukkaL · commit 9b8a92e3e3d0 · 2015-10-18T16:22:32.000-07:00
To import module m in a stub, you must now use something like
'import m as m'. This behavior conforms to PEP 484.
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -737,16 +737,22 @@ def bind_class_type_variables_in_symbol_table(
 
     def visit_import(self, i: Import) -> None:
         for id, as_id in i.ids:
-            if as_id is not None and as_id != id:
-                self.add_module_symbol(id, as_id, i)
+            if as_id is not None:
+                self.add_module_symbol(id, as_id, module_public=True, context=i)
             else:
+                # Modules imported in a stub file without using 'as x' won't get exported when
+                # doing 'from m import *'.
+                module_public = not self.is_stub_file
                 base = id.split('.')[0]
-                self.add_module_symbol(base, base, i)
+                self.add_module_symbol(base, base, module_public=module_public,
+                                       context=i)
 
-    def add_module_symbol(self, id: str, as_id: str, context: Context) -> None:
+    def add_module_symbol(self, id: str, as_id: str, module_public: bool,
+                          context: Context) -> None:
         if id in self.modules:
             m = self.modules[id]
-            self.add_symbol(as_id, SymbolTableNode(MODULE_REF, m, self.cur_mod_id), context)
+            self.add_symbol(as_id, SymbolTableNode(MODULE_REF, m, self.cur_mod_id,
+                                                   module_public=module_public), context)
         else:
             self.add_unknown_symbol(as_id, context)
 
diff --git a/mypy/test/data/semanal-modules.test b/mypy/test/data/semanal-modules.test
@@ -783,8 +783,7 @@ from m.x import nonexistent
 main:1: note: In module imported here:
 tmp/m/x.py:1: error: Module has no attribute 'nonexistent'
 
-
-[case testImportAsInStubs]
+[case testFromImportAsInStub]
 from m import *
 x
 y  # E: Name 'y' is not defined
@@ -796,7 +795,7 @@ x = 1
 y = 2
 [out]
 
-[case testImportAsInNonStub]
+[case testFromImportAsInNonStub]
 from m_ import *
 x
 y
@@ -813,3 +812,31 @@ MypyFile:1(
     NameExpr(x [m2_.x]))
   ExpressionStmt:3(
     NameExpr(y [m2_.y])))
+
+[case testImportAsInStub]
+from m import *
+m2
+m3  # E: Name 'm3' is not defined
+[file m.pyi]
+import m2 as m2
+import m3
+[file m2.py]
+[file m3.py]
+[out]
+
+[case testImportAsInNonStub]
+from m_ import *
+m2_
+m3_
+[file m_.py]
+import m2_ as m2_
+import m3_
+[file m2_.py]
+[file m3_.py]
+[out]
+MypyFile:1(
+  ImportAll:1(m_)
+  ExpressionStmt:2(
+    NameExpr(m2_))
+  ExpressionStmt:3(
+    NameExpr(m3_)))
