Reduce diff

?

Author: Gatsik

mypy/test/teststubtest.py

@@ -39,6 +39,7 @@ def use_tmp_dir(mod_name: str) -> Iterator[str]:
 
 
 stubtest_typing_stub = """
+import collections
 Any = object()
 
 class _SpecialForm:
@@ -2097,7 +2098,7 @@ class Y(TypedDict):
     @collect_cases
     def test_named_tuple(self) -> Iterator[Case]:
         yield Case(
-            stub="from typing import NamedTuple; import collections",
+            stub="from typing import NamedTuple",
             runtime="from typing import NamedTuple",
             error=None,
         )
@@ -2133,7 +2134,7 @@ class X2(NamedTuple):
     @collect_cases
     def test_named_tuple_typing_and_collections(self) -> Iterator[Case]:
         yield Case(
-            stub="from typing import NamedTuple; import collections",
+            stub="from typing import NamedTuple",
             runtime="from collections import namedtuple",
             error=None,
         )

test-data/unit/check-basic.test

@@ -462,7 +462,7 @@ def typeddict() -> Sequence[D]:
 
 a = (a.A(), A())
 a.x  # E: "tuple[a.A, b.A]" has no attribute "x"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-full.pyi]
 
 [case testReturnAnyFromFunctionDeclaredToReturnObject]

test-data/unit/check-callable.test

@@ -491,7 +491,7 @@ def g(o: Thing) -> None:
         i + s  # E: Unsupported operand types for + ("str" and "int")
         o(1,2,3)
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/callable.pyi]
 
 [case testCallableNoArgs]
 

test-data/unit/check-class-namedtuple.test

@@ -214,7 +214,7 @@ i, i = l[0]  # E: Need more than 1 value to unpack (2 expected)
 l = [A(1)]
 a = (1,)  # E: Incompatible types in assignment (expression has type "tuple[int]", \
                variable has type "A")
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleMissingClassAttribute]
 from typing import NamedTuple
@@ -259,7 +259,7 @@ class C(B): pass
 B(1).b
 C(2).b
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/property.pyi]
 
 [case testNewNamedTupleAsDict]
 from typing import NamedTuple, Any
@@ -271,7 +271,7 @@ class X(NamedTuple):
 x: X
 reveal_type(x._asdict())  # N: Revealed type is "builtins.dict[builtins.str, Any]"
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 
 [case testNewNamedTupleReplaceTyped]
 from typing import NamedTuple
@@ -301,7 +301,7 @@ reveal_type(X._field_defaults)  # N: Revealed type is "builtins.dict[builtins.st
 # but it's inferred as `Mapping[str, object]` here due to the fixture we're using
 reveal_type(X.__annotations__)  # N: Revealed type is "typing.Mapping[builtins.str, builtins.object]"
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict-full.pyi]
 
 [case testNewNamedTupleUnit]
 from typing import NamedTuple
@@ -326,7 +326,7 @@ class Y(NamedTuple):
 
 reveal_type([X(3, 'b'), Y(1, 'a')])  # N: Revealed type is "builtins.list[tuple[builtins.int, builtins.str]]"
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleJoinTuple]
 from typing import NamedTuple
@@ -338,7 +338,7 @@ class X(NamedTuple):
 reveal_type([(3, 'b'), X(1, 'a')])  # N: Revealed type is "builtins.list[tuple[builtins.int, builtins.str]]"
 reveal_type([X(1, 'a'), (3, 'b')])  # N: Revealed type is "builtins.list[tuple[builtins.int, builtins.str]]"
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleWithTooManyArguments]
 from typing import NamedTuple
@@ -358,7 +358,7 @@ class X(typing.NamedTuple):
     x.x: int  # E: Invalid statement in NamedTuple definition; expected "field_name: field_type [= default]"
     z: str = 'z'
     aa: int  # E: Non-default NamedTuple fields cannot follow default fields
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleWithoutTypesSpecified]
 from typing import NamedTuple
@@ -377,7 +377,7 @@ class N(NamedTuple):
 
 def f(a: Type[N]):
     a()  # E: Missing positional arguments "x", "y" in call to "N"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleWithDefaults]
 from typing import List, NamedTuple, Optional
@@ -416,7 +416,7 @@ reveal_type(UserDefined())  # N: Revealed type is "tuple[__main__.Default, fallb
 reveal_type(UserDefined(Default()))  # N: Revealed type is "tuple[__main__.Default, fallback=__main__.UserDefined]"
 UserDefined(1)  # E: Argument 1 to "UserDefined" has incompatible type "int"; expected "Default"
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleWithDefaultsStrictOptional]
 from typing import List, NamedTuple, Optional
@@ -434,7 +434,7 @@ class CannotBeNone(NamedTuple):
     x: int
     y: int = None  # E: Incompatible types in assignment (expression has type "None", variable has type "int")
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testNewNamedTupleWrongType]
 from typing import NamedTuple
@@ -448,8 +448,7 @@ class X(NamedTuple):
 from typing import NamedTuple
 
 class X(NamedTuple):
-    x: int = 1 + '1'  # E: Incompatible types in assignment (expression has type "str", variable has type "int") \
-                      # E: Unsupported operand types for + ("int" and "str")
+    x: int = 1 + '1'  # E: Unsupported left operand type for + ("int")
 [builtins fixtures/tuple.pyi]
 
 [case testNewNamedTupleInheritance]
@@ -608,7 +607,7 @@ class ReuseCallableNamed(NamedTuple):
     def z(self) -> int:  # E: Name "z" already defined on line 31
         return 0
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 
 [case testNewNamedTupleDocString]
 from typing import NamedTuple
@@ -640,7 +639,7 @@ class HasClassMethod(NamedTuple):
         reveal_type(HasClassMethod)  # N: Revealed type is "def (x: builtins.str) -> tuple[builtins.str, fallback=__main__.HasClassMethod]"
         return cls(x=f)
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/classmethod.pyi]
 
 [case testNewNamedTupleStaticMethod]
 from typing import NamedTuple
@@ -652,7 +651,7 @@ class HasStaticMethod(NamedTuple):
     def new(f: str) -> 'HasStaticMethod':
         return HasStaticMethod(x=f)
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/classmethod.pyi]
 
 [case testNewNamedTupleProperty]
 from typing import NamedTuple
@@ -665,7 +664,7 @@ class HasStaticMethod(NamedTuple):
         reveal_type(self)  # N: Revealed type is "tuple[builtins.str, fallback=__main__.HasStaticMethod]"
         return 4
 
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/property.pyi]
 
 [case testTypingExtensionsNamedTuple]
 from typing_extensions import NamedTuple

test-data/unit/check-classes.test

@@ -3868,7 +3868,7 @@ from typing import Type, NamedTuple
 N = NamedTuple('N', [('x', int), ('y', int)])
 def f(a: Type[N]):
     a()
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 [out]
 main:4: error: Missing positional arguments "x", "y" in call to "N"
 
@@ -5346,7 +5346,7 @@ class M(NamedTuple):
 n: N
 m: M
 lst = [n, m]
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/isinstancelist.pyi]
 
 [case testCorrectJoinOfSelfRecursiveTypedDicts]
 from typing import TypedDict
@@ -5377,7 +5377,7 @@ def parse_ast(name_dict: NameDict) -> None:
     if isinstance(name_dict[''], int):
         pass
     reveal_type(name_dict['test']) # N: Revealed type is "tuple[builtins.bool, fallback=__main__.NameInfo]"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/isinstancelist.pyi]
 [typing fixtures/typing-medium.pyi]
 
 [case testCrashInForwardRefToTypedDictWithIsinstance]
@@ -5600,7 +5600,7 @@ class B(object):
         return self.a.x
 
 reveal_type(x.x) # N: Revealed type is "builtins.int"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/property.pyi]
 [out]
 
 [case testCorrectIsinstanceWithForwardUnion]
@@ -5613,7 +5613,7 @@ def f(x: ForwardUnion) -> None:
   reveal_type(x)  # N: Revealed type is "Union[tuple[builtins.int, fallback=__main__.TP], builtins.int]"
   if isinstance(x, TP):
     reveal_type(x)  # N: Revealed type is "tuple[builtins.int, fallback=__main__.TP]"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/isinstance.pyi]
 [out]
 
 [case testCrashInvalidArgsSyntheticClassSyntax]
@@ -5626,7 +5626,7 @@ class NM(NamedTuple):
 # These two should never crash, reveals are in the next test
 TD({'x': []})
 NM(x=[])
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-typeddict.pyi]
 [out]
 
@@ -5645,7 +5645,7 @@ reveal_type(x) # N: Revealed type is "TypedDict('__main__.TD', {'x': builtins.li
 reveal_type(x1) # N: Revealed type is "TypedDict('__main__.TD', {'x': builtins.list[Any]})"
 reveal_type(y) # N: Revealed type is "tuple[builtins.list[Any], fallback=__main__.NM]"
 reveal_type(y1) # N: Revealed type is "tuple[builtins.list[Any], fallback=__main__.NM]"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-typeddict.pyi]
 [out]
 
@@ -5659,7 +5659,7 @@ NT = NewType('NT', List[int, str]) # E: "list" expects 1 type argument, but 2 gi
 TD({'x': []})
 NM(x=[])
 NT([])
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-typeddict.pyi]
 [out]
 
@@ -5677,7 +5677,7 @@ x: A1
 y: A2
 reveal_type(x.b) # N: Revealed type is "__main__.B"
 reveal_type(y['b']) # N: Revealed type is "__main__.B"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-typeddict.pyi]
 [out]
 
@@ -5691,7 +5691,7 @@ x: A1
 y: A2
 reveal_type(x.b) # N: Revealed type is "__main__.B"
 reveal_type(y['b']) # N: Revealed type is "__main__.B"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 [typing fixtures/typing-typeddict.pyi]
 [out]
 

test-data/unit/check-custom-plugin.test

@@ -599,7 +599,7 @@ reveal_type(FullyQualifiedTestNamedTuple('')._asdict()) # N: Revealed type is "b
 [file mypy.ini]
 \[mypy]
 plugins=<ROOT>/test-data/unit/plugins/fully_qualified_test_hook.py
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/classmethod.pyi]
 [typing fixtures/typing-typeddict.pyi]
 
 [case testDynamicClassPlugin]

test-data/unit/check-enum.test

@@ -2452,6 +2452,7 @@ class Foo(Enum):
                                       # E: Incompatible types in assignment (expression has type "<typing special form>", variable has type "Foo")
     Baz: Any = Callable[[Dict[str, "Missing"]], None]  # E: Enum members must be left unannotated \
                                                        # N: See https://typing.readthedocs.io/en/latest/spec/enums.html#defining-members \
+                                                       # E: Type application targets a non-generic function or class \
                                                        # E: Name "Missing" is not defined
 
 reveal_type(Foo.Bar)  # N: Revealed type is "Literal[__main__.Foo.Bar]?"

test-data/unit/check-expressions.test

@@ -2459,7 +2459,7 @@ def f() -> int:  # E: Missing return statement
 from typing import TypeVar
 T = TypeVar("T")
 x: int
-x + T  # E: Unsupported operand types for + ("int" and "TypeVar")
+x + T  # E: Unsupported left operand type for + ("int")
 T()  # E: "TypeVar" not callable
 [builtins fixtures/tuple.pyi]
 [typing fixtures/typing-full.pyi]

test-data/unit/check-flags.test

@@ -1024,7 +1024,7 @@ from missing import Unchecked
 
 Point = NamedTuple('Point', [('x', List[Unchecked]),
                              ('y', Unchecked)])
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 [out]
 main:5: error: NamedTuple type becomes "tuple[list[Any], Any]" due to an unfollowed import
 
@@ -1315,7 +1315,7 @@ Point = NamedTuple('Point', [('x', int), ('y', int)])  # no error
 
 def origin() -> Point:
     return Point(x=0, y=0)
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testDisallowAnyExprNewType]
 # flags: --disallow-any-expr
@@ -1908,7 +1908,7 @@ z = cast(List[Any], x)  # E: Explicit "Any" is not allowed  [explicit-any]
 from typing import Any, List, NamedTuple
 
 Point = NamedTuple('Point', [('x', List[Any]), ('y', Any)])  # E: Explicit "Any" is not allowed  [explicit-any]
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/list.pyi]
 
 [case testDisallowAnyExplicitTypeVarConstraint]
 # flags: --disallow-any-explicit --show-error-codes

test-data/unit/check-inference.test

@@ -3442,7 +3442,7 @@ x = t and d[t]
 reveal_type(x)  # N: Revealed type is "Union[None, builtins.bytes]"
 if x:
     reveal_type(x)  # N: Revealed type is "builtins.bytes"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 
 [case testRegression11705_NoStrict]
 # flags: --no-strict-optional
@@ -3457,7 +3457,7 @@ x = t and d[t]
 reveal_type(x)  # N: Revealed type is "builtins.bytes"
 if x:
     reveal_type(x)  # N: Revealed type is "builtins.bytes"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/dict.pyi]
 
 [case testSuggestPep604AnnotationForPartialNone]
 # flags: --local-partial-types --python-version 3.10