Also update UNBOUND_IMPORTED Name expressions.

Author: carljm

mypy/semanal_pass3.py

@@ -268,13 +268,23 @@ def visit_import_from(self, imp: ImportFrom) -> None:
         for id, as_id in imp.names:
             my_node = self.sem.globals.get(as_id or id)
             src_node = module.names.get(id)
+            # Fixup remaining UNBOUND_IMPORTED nodes from import cycles
             if my_node and src_node and my_node.kind == UNBOUND_IMPORTED:
                 my_node.kind = src_node.kind
                 my_node.node = src_node.node
                 my_node.type_override = src_node.type_override
                 my_node.normalized = src_node.normalized
                 my_node.alias_tvars = src_node.alias_tvars
 
+    def visit_name_expr(self, expr: NameExpr) -> None:
+        # Fixup remaining UNBOUND_IMPORTED nodes from import cycles
+        if expr.kind == UNBOUND_IMPORTED:
+            n = self.sem.lookup(expr.name, expr)
+            if n:
+                expr.kind = n.kind
+                expr.node = n.node
+                expr.fullname = n.fullname
+
     # Helpers
 
     def perform_transform(self, node: Union[Node, SymbolTableNode],

test-data/unit/check-modules.test

@@ -1947,16 +1947,20 @@ main:3: error: Revealed type is 'Any'
 
 [case testImportCycle]
 from m import One
-reveal_type(One)  # E: Revealed type is 'def () -> m.one.One'
+reveal_type(One)
 [file m/__init__.py]
 from .one import One
 from .two import Two
-reveal_type(One)  # E: Revealed type is 'def () -> m.one.One'
+reveal_type(One)
 [file m/one.py]
 class One:
     pass
 [file m/two.py]
 from m import One
-reveal_type(One)  # E: Revealed type is 'def () -> m.one.One'
+reveal_type(One)
 class Two:
     pass
+[out]
+tmp/m/two.py:2: error: Revealed type is 'def () -> m.one.One'
+tmp/m/__init__.py:3: error: Revealed type is 'def () -> m.one.One'
+main:2: error: Revealed type is 'def () -> m.one.One'