Merge remote-tracking branch 'upstream/master' into default-native-parser

Author: ilevkivskyi

mypy-requirements.txt

@@ -6,4 +6,4 @@ mypy_extensions>=1.0.0
 pathspec>=1.0.0
 tomli>=1.1.0; python_version<'3.11'
 librt>=0.15.0; platform_python_implementation != 'PyPy'
-ast-serialize>=0.11.0,<1.0.0
+ast-serialize>=0.11.1,<1.0.0

mypy/checkexpr.py

@@ -1657,6 +1657,18 @@ def check_call(
                 object_type,
                 original_type=callee,
             )
+        elif isinstance(callee, LiteralType):
+            return self.check_call(
+                callee.fallback,
+                args,
+                arg_kinds,
+                context,
+                arg_names,
+                callable_node,
+                callable_name,
+                object_type,
+                original_type=original_type,
+            )
         elif isinstance(callee, UninhabitedType):
             ret = UninhabitedType()
             ret.ambiguous = callee.ambiguous

mypy/semanal.py

@@ -259,6 +259,7 @@
 )
 from mypy.typeops import function_type, get_type_vars, try_getting_str_literals_from_type
 from mypy.types import (
+    ANNOTATED_TYPE_NAMES,
     ASSERT_TYPE_NAMES,
     DATACLASS_TRANSFORM_NAMES,
     DEPRECATED_TYPE_NAMES,
@@ -1190,11 +1191,15 @@ def is_expected_self_type(self, typ: Type, is_classmethod: bool) -> bool:
                 sym = self.lookup_qualified(typ.name, typ, suppress_errors=True)
                 if sym is not None and sym.fullname in TYPE_NAMES and typ.args:
                     return self.is_expected_self_type(typ.args[0], is_classmethod=False)
+                if sym is not None and sym.fullname in ANNOTATED_TYPE_NAMES and typ.args:
+                    return self.is_expected_self_type(typ.args[0], is_classmethod=True)
             return False
         if isinstance(typ, TypeVarType):
             return typ == self.type.self_type
         if isinstance(typ, UnboundType):
             sym = self.lookup_qualified(typ.name, typ, suppress_errors=True)
+            if sym is not None and sym.fullname in ANNOTATED_TYPE_NAMES and typ.args:
+                return self.is_expected_self_type(typ.args[0], is_classmethod=False)
             return sym is not None and sym.fullname in SELF_TYPE_NAMES
         return False
 

pyproject.toml

@@ -15,7 +15,7 @@ requires = [
     "types-psutil",
     "types-setuptools",
     # required to work around a mypyc import bug
-    "ast-serialize>=0.11.0,<1.0.0",
+    "ast-serialize>=0.11.1,<1.0.0",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -59,7 +59,7 @@ dependencies = [
   "pathspec>=1.0.0",
   "tomli>=1.1.0; python_version<'3.11'",
   "librt>=0.15.0; platform_python_implementation != 'PyPy'",
-  "ast-serialize>=0.11.0,<1.0.0",
+  "ast-serialize>=0.11.1,<1.0.0",
 ]
 dynamic = ["version"]
 

test-data/unit/check-enum.test

@@ -2983,3 +2983,27 @@ def f(x: SE | None) -> None:
     else:
         reveal_type(x)  # N: Revealed type is "__main__.SE | None"
 [builtins fixtures/primitives.pyi]
+
+
+[case testCallableEnumNarrowing]
+# See: https://github.com/python/mypy/issues/17222
+
+import enum
+
+class Foo(enum.Enum):
+     FOO1 = enum.auto()
+     FOO2 = enum.auto()
+
+     def __call__(self) -> str:
+         return self.name
+
+foo = Foo.FOO1
+
+match foo:
+     case Foo.FOO1:
+        foo()
+        reveal_type(foo) # N: Revealed type is "Literal[__main__.Foo.FOO1]"
+     case _:
+        foo()
+        reveal_type(foo) # N: Revealed type is "Literal[__main__.Foo.FOO2]"
+[builtins fixtures/primitives.pyi]

test-data/unit/check-selftype.test

@@ -1549,6 +1549,24 @@ reveal_type(D.meth())  # N: Revealed type is "__main__.D"
 reveal_type(D.bad())  # N: Revealed type is "Never"
 [builtins fixtures/classmethod.pyi]
 
+[case testTypingSelfAnnotatedType]
+# See: https://github.com/python/mypy/issues/21917
+
+from typing import Self
+from typing_extensions import Annotated
+
+class C:
+    def foo(self: Annotated[Self, "some_metadata"], x: int) -> None:
+        ...
+
+    @classmethod
+    def bar(cls: Annotated[type[Self], "some_metadata"], x: int) -> None:
+        ...
+
+reveal_type(C.foo) # N: Revealed type is "def [Self <: __main__.C] (self: Self`2, x: builtins.int)"
+reveal_type(C.bar) # N: Revealed type is "def (x: builtins.int)"
+[builtins fixtures/tuple.pyi]
+
 [case testTypingSelfOverload]
 from typing import Self, overload, Union
 

test-requirements.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --allow-unsafe --output-file=test-requirements.txt --strip-extras test-requirements.in
 #
-ast-serialize==0.11.0
+ast-serialize==0.11.1
     # via -r mypy-requirements.txt
 attrs==26.1.0
     # via -r test-requirements.in