fix more tests

python · JelleZijlstra · Feb 17, 2022 · Jan 20, 2022 · Jan 20, 2022 · Jan 20, 2022
commit 63f8634eb1d33c554d46bdf554f0b8418c5c57fc
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -4787,15 +4787,26 @@ def add_imported_symbol(self,
         """Add an alias to an existing symbol through import."""
         assert not module_hidden or not module_public
 
-        node_node: Optional[SymbolNode] = node.node
-        if self.is_class_scope() and isinstance(node_node, (FuncBase, Var)):
-            # Imports inside class scope do not produce methods.
-            # We construct a Var so as to treat them more like assignments.
-            node_node = Var(node_node.name, node_node.type)
-            assert self.type is not None
-            node_node.info = self.type
+        symbol_node: Optional[SymbolNode] = node.node
+        if self.is_class_scope() and isinstance(symbol_node, (FuncBase, Var)):
+            # We construct a new node to represent this symbol and set its `info` attribute
+            # to `self.type`. Note that imports inside class scope do not produce methods, so
+            # in all cases constructing a Var gets us the assignment like behaviour we want.
+            existing = self.current_symbol_table().get(name)
+            if (
+                existing is not None
+                and isinstance(existing.node, Var)
+                and existing.type == symbol_node.type
+            ):
+                # The redefinition checks in `add_symbol_table_node` don't work for our
+                # constructed Var, so check for possible redefinitions here.
+                symbol_node = existing.node
+            else:
+                symbol_node = Var(symbol_node.name, symbol_node.type)
+                assert self.type is not None
+                symbol_node.info = self.type
 
-        symbol = SymbolTableNode(node.kind, node_node,
+        symbol = SymbolTableNode(node.kind, symbol_node,
                                  module_public=module_public,
                                  module_hidden=module_hidden)
         self.add_symbol_table_node(name, symbol, context)

diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test
@@ -7161,6 +7161,22 @@ reveal_type(Foo.mod.foo)  # N: Revealed type is "builtins.int"
 [file mod.py]
 foo: int
 
+[case testClassScopeImportFunctionAlias]
+class Foo:
+    from mod import foo
+    bar = foo
+
+    from mod import const_foo
+    const_bar = const_foo
+
+reveal_type(Foo.foo)  # N: Revealed type is "def (x: builtins.int, y: builtins.int) -> builtins.int"
+reveal_type(Foo.bar)  # N: Revealed type is "def (x: builtins.int, y: builtins.int) -> builtins.int"
+reveal_type(Foo.const_foo)  # N: Revealed type is "builtins.int"
+reveal_type(Foo.const_bar)  # N: Revealed type is "builtins.int"
+[file mod.py]
+def foo(x: int, y: int) -> int: ...
+const_foo: int
+
 [case testClassScopeImportModuleStar]
 class Foo:
     from mod import *

diff --git a/test-data/unit/semanal-modules.test b/test-data/unit/semanal-modules.test
@@ -568,7 +568,7 @@ MypyFile:1(
     ImportFrom:2(_x, [y])
     AssignmentStmt:3(
       NameExpr(z* [m])
-      NameExpr(y [_x.y]))))
+      NameExpr(y [None]))))
 
 [case testImportInClassBody2]
 class A: