Use variable name to determined NamedTuple class name

msullivan · msullivan · commit 0da9263a9d29 · 2019-04-18T14:12:52.000-07:00
This lets us avoid inserting line numbers into the name when the variable name and argument to NamedTuple disagree. This is good, because the line numbers are ugly and when combined with bug #6548 causes problems when a namedtuple is reexported.
diff --git a/mypy/newsemanal/semanal_namedtuple.py b/mypy/newsemanal/semanal_namedtuple.py
@@ -177,14 +177,20 @@ def check_namedtuple(self,
             info = self.build_namedtuple_typeinfo(name, [], [], {}, node.line)
             self.store_namedtuple_info(info, name, call, is_typed)
             return True, info
-        name = cast(Union[StrExpr, BytesExpr, UnicodeExpr], call.args[0]).value
-        if name != var_name or is_func_scope:
-            # There are three special cases where need to give it a unique name derived
+
+        # We use the variable name as the class name if it exists. If
+        # it doesn't, we use the name passed as an argument. We prefer
+        # the variable name because it should be unique inside a
+        # module, and so we don't need to disambiguate it with a line
+        # number.
+        if var_name:
+            name = var_name
+        else:
+            name = cast(Union[StrExpr, BytesExpr, UnicodeExpr], call.args[0]).value
+
+        if var_name is None or is_func_scope:
+            # There are two special cases where need to give it a unique name derived
             # from the line number:
-            #   * There is a name mismatch with l.h.s., therefore we need to disambiguate
-            #     situations like:
-            #         A = NamedTuple('Same', [('x', int)])
-            #         B = NamedTuple('Same', [('y', str)])
             #   * This is a base class expression, since it often matches the class name:
             #         class NT(NamedTuple('NT', [...])):
             #             ...
diff --git a/mypy/semanal_namedtuple.py b/mypy/semanal_namedtuple.py
@@ -162,10 +162,15 @@ def check_namedtuple(self,
             info = self.build_namedtuple_typeinfo(name, [], [], {})
             self.store_namedtuple_info(info, name, call, is_typed)
             return info
-        name = cast(Union[StrExpr, BytesExpr, UnicodeExpr], call.args[0]).value
-        if name != var_name or is_func_scope:
+
+        if var_name:
+            name = var_name
+        else:
+            name = cast(Union[StrExpr, BytesExpr, UnicodeExpr], call.args[0]).value
+        if var_name is None or is_func_scope:
             # Give it a unique name derived from the line number.
             name += '@' + str(call.line)
+
         if len(defaults) > 0:
             default_items = {
                 arg_name: default
diff --git a/test-data/unit/check-incremental.test b/test-data/unit/check-incremental.test
@@ -4947,7 +4947,7 @@ from typing import NamedTuple
 NT = NamedTuple('BadName', [('x', int)])
 [out]
 [out2]
-tmp/a.py:3: error: Revealed type is 'Tuple[builtins.int, fallback=b.BadName@2]'
+tmp/a.py:3: error: Revealed type is 'Tuple[builtins.int, fallback=b.NT]'
 
 [case testNewAnalyzerIncrementalBrokenNamedTupleNested]
 # flags: --new-semantic-analyzer
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
@@ -8812,3 +8812,25 @@ B().x
 [out]
 ==
 ==
+
+[case testReexportNamedTupleChange]
+from m import M
+
+def f(x: M) -> None: ...
+
+f(M(0))
+
+[file m.py]
+from n import M
+
+[file n.py]
+from typing import NamedTuple
+M = NamedTuple('_N', [('x', int)])
+
+[file n.py.2]
+# change the line numbers
+from typing import NamedTuple
+M = NamedTuple('_N', [('x', int)])
+
+[out]
+==
