Merge branch 'master' into weak-proxy

Author: BobTheBuidler

.github/workflows/test.yml

@@ -37,11 +37,6 @@ jobs:
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
-        - name: Test suite with py39-windows-64
-          python: '3.9'
-          os: windows-latest
-          toxenv: py39
-          tox_extra_args: "-n 4"
         - name: Test suite with py310-ubuntu
           python: '3.10'
           os: ubuntu-24.04-arm
@@ -64,6 +59,11 @@ jobs:
           toxenv: py
           tox_extra_args: "-n 4"
           test_mypyc: true
+        - name: Test suite with py313-windows-64
+          python: '3.13'
+          os: windows-latest
+          toxenv: py
+          tox_extra_args: "-n 4"
 
         - name: Test suite with py314-dev-ubuntu
           python: '3.14-dev'

misc/typeshed_patches/0001-Partially-revert-Clean-up-argparse-hacks.patch

@@ -1,4 +1,4 @@
-From 05f351f6a37fe8b73c698c348bf6aa5108363049 Mon Sep 17 00:00:00 2001
+From 84a9d586544a0408d4654f57f83a93cb048070fb Mon Sep 17 00:00:00 2001
 From: Marc Mueller <[email protected]>
 Date: Sat, 15 Feb 2025 20:11:06 +0100
 Subject: [PATCH] Partially revert Clean up argparse hacks
@@ -8,15 +8,15 @@ Subject: [PATCH] Partially revert Clean up argparse hacks
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/argparse.pyi b/mypy/typeshed/stdlib/argparse.pyi
-index 95ad6c7da..79e6cfde1 100644
+index b9fa31139..3c3ba116a 100644
 --- a/mypy/typeshed/stdlib/argparse.pyi
 +++ b/mypy/typeshed/stdlib/argparse.pyi
 @@ -2,7 +2,7 @@ import sys
  from _typeshed import SupportsWrite, sentinel
  from collections.abc import Callable, Generator, Iterable, Sequence
  from re import Pattern
--from typing import IO, Any, ClassVar, Final, Generic, NoReturn, Protocol, TypeVar, overload
-+from typing import IO, Any, ClassVar, Final, Generic, NewType, NoReturn, Protocol, TypeVar, overload
+-from typing import IO, Any, ClassVar, Final, Generic, NoReturn, Protocol, TypeVar, overload, type_check_only
++from typing import IO, Any, ClassVar, Final, Generic, NewType, NoReturn, Protocol, TypeVar, overload, type_check_only
  from typing_extensions import Self, TypeAlias, deprecated
 
  __all__ = [
@@ -41,5 +41,5 @@ index 95ad6c7da..79e6cfde1 100644
          default: Any = ...,
          type: _ActionType = ...,
 -- 
-2.49.0
+2.50.1
 

misc/typeshed_patches/0001-Revert-Remove-redundant-inheritances-from-Iterator.patch

@@ -1,4 +1,4 @@
-From 363d69b366695fea117631d30c348e36b9a5a99d Mon Sep 17 00:00:00 2001
+From c217544146d36899d50e828d627652a0d8f63bb7 Mon Sep 17 00:00:00 2001
 From: Marc Mueller <[email protected]>
 Date: Sat, 21 Dec 2024 22:36:38 +0100
 Subject: [PATCH] Revert Remove redundant inheritances from Iterator in
@@ -15,7 +15,7 @@ Subject: [PATCH] Revert Remove redundant inheritances from Iterator in
  7 files changed, 34 insertions(+), 34 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/_asyncio.pyi b/mypy/typeshed/stdlib/_asyncio.pyi
-index 4544680cc..19a2d12d8 100644
+index ed56f33af..5253e967e 100644
 --- a/mypy/typeshed/stdlib/_asyncio.pyi
 +++ b/mypy/typeshed/stdlib/_asyncio.pyi
 @@ -1,6 +1,6 @@
@@ -36,10 +36,10 @@ index 4544680cc..19a2d12d8 100644
      @property
      def _exception(self) -> BaseException | None: ...
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index ea77a730f..900c4c93f 100644
+index 0575be3c8..d9be595fe 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1170,7 +1170,7 @@ class frozenset(AbstractSet[_T_co]):
+@@ -1186,7 +1186,7 @@ class frozenset(AbstractSet[_T_co]):
      def __hash__(self) -> int: ...
      def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
@@ -48,7 +48,7 @@ index ea77a730f..900c4c93f 100644
      def __new__(cls, iterable: Iterable[_T], start: int = 0) -> Self: ...
      def __iter__(self) -> Self: ...
      def __next__(self) -> tuple[int, _T]: ...
-@@ -1366,7 +1366,7 @@ else:
+@@ -1380,7 +1380,7 @@ else:
 
  exit: _sitebuiltins.Quitter
 
@@ -57,7 +57,7 @@ index ea77a730f..900c4c93f 100644
      @overload
      def __new__(cls, function: None, iterable: Iterable[_T | None], /) -> Self: ...
      @overload
-@@ -1431,7 +1431,7 @@ license: _sitebuiltins._Printer
+@@ -1444,7 +1444,7 @@ license: _sitebuiltins._Printer
 
  def locals() -> dict[str, Any]: ...
 
@@ -66,7 +66,7 @@ index ea77a730f..900c4c93f 100644
      # 3.14 adds `strict` argument.
      if sys.version_info >= (3, 14):
          @overload
-@@ -1734,7 +1734,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
+@@ -1750,7 +1750,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
 
  quit: _sitebuiltins.Quitter
 
@@ -75,7 +75,7 @@ index ea77a730f..900c4c93f 100644
      @overload
      def __new__(cls, sequence: Reversible[_T], /) -> Iterator[_T]: ...  # type: ignore[misc]
      @overload
-@@ -1795,7 +1795,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
+@@ -1814,7 +1814,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
  @overload
  def vars(object: Any = ..., /) -> dict[str, Any]: ...
 
@@ -107,7 +107,7 @@ index 2c8e7109c..4ed0ab1d8 100644
      restkey: _T | None
      restval: str | Any | None
 diff --git a/mypy/typeshed/stdlib/fileinput.pyi b/mypy/typeshed/stdlib/fileinput.pyi
-index 948b39ea1..1d5f9cf00 100644
+index 910d63814..eb942bc55 100644
 --- a/mypy/typeshed/stdlib/fileinput.pyi
 +++ b/mypy/typeshed/stdlib/fileinput.pyi
 @@ -1,8 +1,8 @@
@@ -116,12 +116,12 @@ index 948b39ea1..1d5f9cf00 100644
 -from collections.abc import Callable, Iterable
 +from collections.abc import Callable, Iterable, Iterator
  from types import GenericAlias, TracebackType
--from typing import IO, Any, AnyStr, Generic, Literal, Protocol, overload
-+from typing import IO, Any, AnyStr, Literal, Protocol, overload
+-from typing import IO, Any, AnyStr, Generic, Literal, Protocol, overload, type_check_only
++from typing import IO, Any, AnyStr, Literal, Protocol, overload, type_check_only
  from typing_extensions import Self, TypeAlias
 
  __all__ = [
-@@ -104,7 +104,7 @@ def fileno() -> int: ...
+@@ -105,7 +105,7 @@ def fileno() -> int: ...
  def isfirstline() -> bool: ...
  def isstdin() -> bool: ...
 
@@ -307,10 +307,10 @@ index b79f9e773..f276372d0 100644
      def __iter__(self) -> Self: ...
      def next(self, timeout: float | None = None) -> _T: ...
 diff --git a/mypy/typeshed/stdlib/sqlite3/__init__.pyi b/mypy/typeshed/stdlib/sqlite3/__init__.pyi
-index 5d3c2330b..ab783dbde 100644
+index bcfea3a13..5a659deac 100644
 --- a/mypy/typeshed/stdlib/sqlite3/__init__.pyi
 +++ b/mypy/typeshed/stdlib/sqlite3/__init__.pyi
-@@ -399,7 +399,7 @@ class Connection:
+@@ -405,7 +405,7 @@ class Connection:
          self, type: type[BaseException] | None, value: BaseException | None, traceback: TracebackType | None, /
      ) -> Literal[False]: ...
 
@@ -320,5 +320,5 @@ index 5d3c2330b..ab783dbde 100644
      @property
      def connection(self) -> Connection: ...
 -- 
-2.49.0
+2.50.1
 

mypy/checker.py

@@ -730,7 +730,7 @@ def _visit_overloaded_func_def(self, defn: OverloadedFuncDef) -> None:
                     assert isinstance(item, Decorator)
                     item_type = self.extract_callable_type(item.var.type, item)
                     if item_type is not None:
-                        item_type.definition = item
+                        item_type.definition = item.func
                         item_types.append(item_type)
                 if item_types:
                     defn.type = Overloaded(item_types)
@@ -832,8 +832,10 @@ def check_overlapping_overloads(self, defn: OverloadedFuncDef) -> None:
         # At this point we should have set the impl already, and all remaining
         # items are decorators
 
-        if self.msg.errors.file in self.msg.errors.ignored_files or (
-            self.is_typeshed_stub and self.options.test_env
+        if (
+            self.options.ignore_errors
+            or self.msg.errors.file in self.msg.errors.ignored_files
+            or (self.is_typeshed_stub and self.options.test_env)
         ):
             # This is a little hacky, however, the quadratic check here is really expensive, this
             # method has no side effects, so we should skip it if we aren't going to report
@@ -1444,7 +1446,19 @@ def check_func_def(
                     # TODO: Find a way of working around this limitation
                     if _is_empty_generator_function(item) or len(expanded) >= 2:
                         self.binder.suppress_unreachable_warnings()
-                    self.accept(item.body)
+                    # When checking a third-party library, we can skip function body,
+                    # if during semantic analysis we found that there are no attributes
+                    # defined via self here.
+                    if (
+                        not (
+                            self.options.ignore_errors
+                            or self.msg.errors.file in self.msg.errors.ignored_files
+                        )
+                        or self.options.preserve_asts
+                        or not isinstance(defn, FuncDef)
+                        or defn.has_self_attr_def
+                    ):
+                        self.accept(item.body)
                 unreachable = self.binder.is_unreachable()
                 if new_frame is not None:
                     self.binder.pop_frame(True, 0)
@@ -2127,6 +2141,9 @@ def check_method_override(
 
         Return a list of base classes which contain an attribute with the method name.
         """
+        if self.options.ignore_errors or self.msg.errors.file in self.msg.errors.ignored_files:
+            # Method override checks may be expensive, so skip them in third-party libraries.
+            return None
         # Check against definitions in base classes.
         check_override_compatibility = (
             defn.name not in ("__init__", "__new__", "__init_subclass__", "__post_init__")

mypy/checkexpr.py

@@ -2934,7 +2934,7 @@ def infer_overload_return_type(
                 if not args_contain_any:
                     self.chk.store_types(m)
                     if isinstance(infer_type, ProperType) and isinstance(infer_type, CallableType):
-                        self.chk.check_deprecated(infer_type.definition, context)
+                        self.chk.warn_deprecated(infer_type.definition, context)
                     return ret_type, infer_type
                 p_infer_type = get_proper_type(infer_type)
                 if isinstance(p_infer_type, CallableType):
@@ -2975,7 +2975,7 @@ def infer_overload_return_type(
             if isinstance(inferred_callable, ProperType) and isinstance(
                 inferred_callable, CallableType
             ):
-                self.chk.check_deprecated(inferred_callable.definition, context)
+                self.chk.warn_deprecated(inferred_callable.definition, context)
             return return_types[0], inferred_types[0]
 
     def overload_erased_call_targets(
@@ -5350,9 +5350,9 @@ def visit_dict_expr(self, e: DictExpr) -> Type:
         # an error, but returns the TypedDict type that matches the literal it found
         # that would cause a second error when that TypedDict type is returned upstream
         # to avoid the second error, we always return TypedDict type that was requested
-        typeddict_contexts = self.find_typeddict_context(self.type_context[-1], e)
+        typeddict_contexts, exhaustive = self.find_typeddict_context(self.type_context[-1], e)
         if typeddict_contexts:
-            if len(typeddict_contexts) == 1:
+            if len(typeddict_contexts) == 1 and exhaustive:
                 return self.check_typeddict_literal_in_context(e, typeddict_contexts[0])
             # Multiple items union, check if at least one of them matches cleanly.
             for typeddict_context in typeddict_contexts:
@@ -5363,7 +5363,8 @@ def visit_dict_expr(self, e: DictExpr) -> Type:
                 self.chk.store_types(tmap)
                 return ret_type
             # No item matched without an error, so we can't unambiguously choose the item.
-            self.msg.typeddict_context_ambiguous(typeddict_contexts, e)
+            if exhaustive:
+                self.msg.typeddict_context_ambiguous(typeddict_contexts, e)
 
         # fast path attempt
         dt = self.fast_dict_type(e)
@@ -5425,22 +5426,29 @@ def visit_dict_expr(self, e: DictExpr) -> Type:
 
     def find_typeddict_context(
         self, context: Type | None, dict_expr: DictExpr
-    ) -> list[TypedDictType]:
+    ) -> tuple[list[TypedDictType], bool]:
+        """Extract `TypedDict` members of the enclosing context.
+
+        Returns:
+            a 2-tuple, (found_candidates, is_exhaustive)
+        """
         context = get_proper_type(context)
         if isinstance(context, TypedDictType):
-            return [context]
+            return [context], True
         elif isinstance(context, UnionType):
             items = []
+            exhaustive = True
             for item in context.items:
-                item_contexts = self.find_typeddict_context(item, dict_expr)
+                item_contexts, item_exhaustive = self.find_typeddict_context(item, dict_expr)
                 for item_context in item_contexts:
                     if self.match_typeddict_call_with_dict(
                         item_context, dict_expr.items, dict_expr
                     ):
                         items.append(item_context)
-            return items
+                exhaustive = exhaustive and item_exhaustive
+            return items, exhaustive
         # No TypedDict type in context.
-        return []
+        return [], False
 
     def visit_lambda_expr(self, e: LambdaExpr) -> Type:
         """Type check lambda expression."""

mypy/fastparse.py

@@ -2234,7 +2234,7 @@ def visit_index_expr(self, e: IndexExpr) -> None:
         pass
 
     def visit_member_expr(self, e: MemberExpr) -> None:
-        if self.lvalue:
+        if self.lvalue and isinstance(e.expr, NameExpr):
             self.found = True
 
 

mypy/fixup.py

@@ -29,6 +29,7 @@
     Overloaded,
     Parameters,
     ParamSpecType,
+    ProperType,
     TupleType,
     TypeAliasType,
     TypedDictType,
@@ -177,6 +178,11 @@ def visit_overloaded_func_def(self, o: OverloadedFuncDef) -> None:
             item.accept(self)
         if o.impl:
             o.impl.accept(self)
+        if isinstance(o.type, Overloaded):
+            # For error messages we link the original definition for each item.
+            for typ, item in zip(o.type.items, o.items):
+                if isinstance(item, Decorator):
+                    typ.definition = item.func
 
     def visit_decorator(self, d: Decorator) -> None:
         if self.current_info is not None:
@@ -187,6 +193,8 @@ def visit_decorator(self, d: Decorator) -> None:
             d.var.accept(self)
         for node in d.decorators:
             node.accept(self)
+        if isinstance(d.var.type, ProperType) and isinstance(d.var.type, CallableType):
+            d.var.type.definition = d.func
 
     def visit_class_def(self, c: ClassDef) -> None:
         for v in c.type_vars:

mypy/fscache.py

@@ -117,7 +117,12 @@ def init_under_package_root(self, path: str) -> bool:
             if not stat.S_ISDIR(st.st_mode):
                 return False
         ok = False
-        drive, path = os.path.splitdrive(path)  # Ignore Windows drive name
+
+        # skip if on a different drive
+        current_drive, _ = os.path.splitdrive(os.getcwd())
+        drive, _ = os.path.splitdrive(path)
+        if drive != current_drive:
+            return False
         if os.path.isabs(path):
             path = os.path.relpath(path)
         path = os.path.normpath(path)

mypy/main.py

@@ -1086,10 +1086,6 @@ def add_invertible_flag(
     internals_group.add_argument(
         "--old-type-inference", action="store_true", help=argparse.SUPPRESS
     )
-    # Deprecated reverse variant of the above.
-    internals_group.add_argument(
-        "--new-type-inference", action="store_true", help=argparse.SUPPRESS
-    )
     internals_group.add_argument(
         "--disable-expression-cache", action="store_true", help=argparse.SUPPRESS
     )
@@ -1507,12 +1503,6 @@ def set_strict_flags() -> None:
     if options.logical_deps:
         options.cache_fine_grained = True
 
-    if options.new_type_inference:
-        print(
-            "Warning: --new-type-inference flag is deprecated;"
-            " new type inference algorithm is already enabled by default"
-        )
-
     if options.strict_concatenate and not strict_option_set:
         print("Warning: --strict-concatenate is deprecated; use --extra-checks instead")
 

mypy/messages.py

@@ -1003,7 +1003,7 @@ def maybe_note_about_special_args(self, callee: CallableType, context: Context)
         if self.prefer_simple_messages():
             return
         # https://github.com/python/mypy/issues/11309
-        first_arg = callee.def_extras.get("first_arg")
+        first_arg = get_first_arg(callee)
         if first_arg and first_arg not in {"self", "cls", "mcs"}:
             self.note(
                 "Looks like the first special argument in a method "
@@ -3007,7 +3007,7 @@ def [T <: int] f(self, x: int, y: T) -> None
             s = definition_arg_names[0] + s
         s = f"{tp.definition.name}({s})"
     elif tp.name:
-        first_arg = tp.def_extras.get("first_arg")
+        first_arg = get_first_arg(tp)
         if first_arg:
             if s:
                 s = ", " + s
@@ -3050,6 +3050,12 @@ def [T <: int] f(self, x: int, y: T) -> None
     return f"def {s}"
 
 
+def get_first_arg(tp: CallableType) -> str | None:
+    if not isinstance(tp.definition, FuncDef) or not tp.definition.info or tp.definition.is_static:
+        return None
+    return tp.definition.original_first_arg
+
+
 def variance_string(variance: int) -> str:
     if variance == COVARIANT:
         return "covariant"