Merge branch 'master' into fix-list-concat-type-context

Author: Ria-K912

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=HAX,Nam,ccompiler,ot,statics,whet,zar
+          - --ignore-words-list=HAX,Nam,ccompiler,keep-alives,ot,statics,whet,zar
         exclude: ^(mypy/test/|mypy/typeshed/|mypyc/test-data/|test-data/).+$
   - repo: https://github.com/rhysd/actionlint
     rev: v1.7.7

CHANGELOG.md

@@ -1,4 +1,4 @@
-From d3dabcf7b7aaf0997b59f0a28bb41d17b6098f2c Mon Sep 17 00:00:00 2001
+From b5d1e4c76d8139e1a20f9178e8123f3ee39084d2 Mon Sep 17 00:00:00 2001
 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 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 23b690a9c..0ce93a435 100644
+index 242093e1e..92bb4e5f4 100644
 --- a/mypy/typeshed/stdlib/_asyncio.pyi
 +++ b/mypy/typeshed/stdlib/_asyncio.pyi
 @@ -1,6 +1,6 @@
@@ -36,10 +36,10 @@ index 23b690a9c..0ce93a435 100644
      @property
      def _exception(self) -> BaseException | None: ...
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index 1808e28e2..9db6f4fc7 100644
+index e63b74214..9ea382dd6 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1369,7 +1369,7 @@ class frozenset(AbstractSet[_T_co]):
+@@ -1368,7 +1368,7 @@ class frozenset(AbstractSet[_T_co]):
      def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
  @disjoint_base
@@ -48,7 +48,7 @@ index 1808e28e2..9db6f4fc7 100644
      def __new__(cls, iterable: Iterable[_T], start: int = 0) -> Self: ...
      def __iter__(self) -> Self: ...
      def __next__(self) -> tuple[int, _T]: ...
-@@ -1635,7 +1635,7 @@ else:
+@@ -1634,7 +1634,7 @@ else:
  exit: _sitebuiltins.Quitter
 
  @disjoint_base
@@ -57,7 +57,7 @@ index 1808e28e2..9db6f4fc7 100644
      @overload
      def __new__(cls, function: None, iterable: Iterable[_T | None], /) -> Self: ...
      @overload
-@@ -1706,7 +1706,7 @@ license: _sitebuiltins._Printer
+@@ -1705,7 +1705,7 @@ license: _sitebuiltins._Printer
  def locals() -> dict[str, Any]: ...
 
  @disjoint_base
@@ -66,7 +66,7 @@ index 1808e28e2..9db6f4fc7 100644
      # 3.14 adds `strict` argument.
      if sys.version_info >= (3, 14):
          @overload
-@@ -2022,7 +2022,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
+@@ -2021,7 +2021,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
  quit: _sitebuiltins.Quitter
 
  @disjoint_base
@@ -75,7 +75,7 @@ index 1808e28e2..9db6f4fc7 100644
      @overload
      def __new__(cls, sequence: Reversible[_T], /) -> Iterator[_T]: ...  # type: ignore[misc]
      @overload
-@@ -2100,7 +2100,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
+@@ -2101,7 +2101,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
  def vars(object: Any = ..., /) -> dict[str, Any]: ...
 
  @disjoint_base
@@ -131,10 +131,10 @@ index 37783254c..db9c228f5 100644
      @overload
      def __init__(
 diff --git a/mypy/typeshed/stdlib/itertools.pyi b/mypy/typeshed/stdlib/itertools.pyi
-index d26a4e1da..9d1cd84da 100644
+index 60e79bc2e..fd7daf11e 100644
 --- a/mypy/typeshed/stdlib/itertools.pyi
 +++ b/mypy/typeshed/stdlib/itertools.pyi
-@@ -28,7 +28,7 @@ _Predicate: TypeAlias = Callable[[_T], object]
+@@ -28,7 +28,7 @@ _Predicate = Callable[[_T], object]
  # Technically count can take anything that implements a number protocol and has an add method
  # but we can't enforce the add method
  @disjoint_base
@@ -295,13 +295,13 @@ index d26a4e1da..9d1cd84da 100644
              @overload
              def __new__(cls, iterable: Iterable[_T], n: Literal[1], *, strict: Literal[True]) -> batched[tuple[_T]]: ...
 diff --git a/mypy/typeshed/stdlib/multiprocessing/pool.pyi b/mypy/typeshed/stdlib/multiprocessing/pool.pyi
-index b79f9e773..f276372d0 100644
+index 5642e50d0..203c5887c 100644
 --- a/mypy/typeshed/stdlib/multiprocessing/pool.pyi
 +++ b/mypy/typeshed/stdlib/multiprocessing/pool.pyi
 @@ -1,4 +1,4 @@
 -from collections.abc import Callable, Iterable, Mapping
 +from collections.abc import Callable, Iterable, Iterator, Mapping
- from multiprocessing.context import DefaultContext, Process
+ from multiprocessing.context import DefaultContext, Process as _Process
  from types import GenericAlias, TracebackType
  from typing import Any, Final, Generic, TypeVar
 @@ -32,7 +32,7 @@ class MapResult(ApplyResult[list[_T]]):
@@ -314,10 +314,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 7c033bdf4..7bf020558 100644
+index 80a02079d..d1065a509 100644
 --- a/mypy/typeshed/stdlib/sqlite3/__init__.pyi
 +++ b/mypy/typeshed/stdlib/sqlite3/__init__.pyi
-@@ -426,7 +426,7 @@ class Connection:
+@@ -437,7 +437,7 @@ class Connection:
      ) -> Literal[False]: ...
 
  @disjoint_base
@@ -327,5 +327,5 @@ index 7c033bdf4..7bf020558 100644
      @property
      def connection(self) -> Connection: ...
 -- 
-2.54.0
+2.55.0
 

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

@@ -31,16 +31,7 @@ def is_whl_or_tar(name: str) -> bool:
 
 
 def item_ok_for_pypi(name: str) -> bool:
-    if not is_whl_or_tar(name):
-        return False
-
-    name = name.removesuffix(".tar.gz")
-    name = name.removesuffix(".whl")
-
-    if name.endswith("wasm32"):
-        return False
-
-    return True
+    return is_whl_or_tar(name)
 
 
 def get_release_for_tag(tag: str) -> dict[str, Any]:

misc/upload-pypi.py

@@ -5,5 +5,5 @@ typing_extensions>=4.14.0; python_version>='3.15'
 mypy_extensions>=1.0.0
 pathspec>=1.0.0
 tomli>=1.1.0; python_version<'3.11'
-librt>=0.11.0; platform_python_implementation != 'PyPy'
-ast-serialize>=0.5.0,<1.0.0
+librt>=0.13.0; platform_python_implementation != 'PyPy'
+ast-serialize>=0.6.0,<1.0.0

mypy-requirements.txt

@@ -1030,7 +1030,9 @@ def parse_all(self, states: list[State], post_parse: bool = True) -> None:
 
         parallel_states = []
         for state in states:
-            if not self.fscache.exists(state.xpath, real_only=True):
+            if not self.fscache.exists(state.xpath, real_only=True) or (
+                self.shadow_map and self.maybe_swap_for_shadow_path(state.xpath) != state.xpath
+            ):
                 state.source = state.get_source()
             if state.tree is not None:
                 # The file was already parsed.
@@ -4343,7 +4345,7 @@ def load_graph(
         for dep in st.ancestors + dependencies + st.suppressed:
             ignored = dep in st.suppressed_set and dep not in entry_points
             if ignored and dep not in added:
-                manager.missing_modules[dep] = SuppressionReason.NOT_FOUND
+                manager.missing_modules.setdefault(dep, SuppressionReason.NOT_FOUND)
                 # TODO: for now we skip this in the daemon as a performance optimization.
                 # This however creates a correctness issue, see #7777 and State.is_fresh().
                 if not manager.use_fine_grained_cache() or manager.options.warn_unused_configs:

mypy/build.py

@@ -1487,7 +1487,8 @@ def check_func_def(
                         # TODO: check recursively for inner type variables
                         if (
                             arg_type.variance == COVARIANT
-                            and defn.name not in ("__init__", "__new__", "__post_init__")
+                            and defn.name
+                            not in {"__init__", "__new__", "__post_init__", "__replace__"}
                             and not is_private(defn.name)  # private methods are not inherited
                             and (i != 0 or not found_self)
                         ):
@@ -1825,6 +1826,7 @@ def check_unbound_return_typevar(self, typ: CallableType) -> None:
                         "Consider using the upper bound "
                         f"{format_type(typ.ret_type.upper_bound, self.options)} instead",
                         context=typ.ret_type,
+                        code=TYPE_VAR,
                     )
 
     def check_default_params(self, item: FuncItem, body_is_trivial: bool | None = None) -> None:
@@ -3132,7 +3134,7 @@ class C(B, A[int]): ...  # this is unsafe because...
             x: A[int] = C()
             x.foo  # ...runtime type is (str) -> None, while static type is (int) -> None
         """
-        if name in ("__init__", "__new__", "__init_subclass__"):
+        if name in {"__init__", "__new__", "__init_subclass__", "__replace__"}:
             # __init__ and friends can be incompatible -- it's a special case.
             return
         first = base1.names[name]
@@ -6857,9 +6859,13 @@ def comparison_type_narrowing_helper(self, node: ComparisonExpr) -> tuple[TypeMa
                         for known_item in container_item_types:
                             # Match the should_coerce_literals logic from narrow_type_by_identity_equality
                             p_known_item = get_proper_type(known_item)
-                            if is_literal_type_like(p_known_item) or (
-                                isinstance(p_known_item, Instance) and p_known_item.type.is_enum
-                            ):
+                            if (
+                                is_literal_type_like(p_known_item)
+                                or (
+                                    isinstance(p_known_item, Instance)
+                                    and p_known_item.type.is_enum
+                                )
+                            ) and not has_custom_eq_checks(p_known_item):
                                 known_item = coerce_to_literal(known_item)
                             if_map, else_map = self.narrow_type_by_identity_equality(
                                 "==",
@@ -8128,7 +8134,20 @@ def iterable_item_type(self, it: ProperType, context: Context) -> Type:
         return self.analyze_iterable_item_type_without_expression(it, context)[1]
 
     def function_type(self, func: FuncBase) -> FunctionLike:
-        return function_type(func, self.named_type("builtins.function"))
+        typ = function_type(func, self.named_type("builtins.function"))
+        if (
+            isinstance(func, FuncItem)
+            and func.is_coroutine
+            and not func.is_async_generator
+            and func.type is None
+            and isinstance(typ, CallableType)
+        ):
+            any_type = AnyType(TypeOfAny.special_form)
+            ret_type = self.named_generic_type(
+                "typing.Coroutine", [any_type, any_type, typ.ret_type]
+            )
+            return typ.copy_modified(ret_type=ret_type)
+        return typ
 
     def push_type_map(self, type_map: TypeMap, *, from_assignment: bool = True) -> None:
         if is_unreachable_map(type_map):
@@ -8874,6 +8893,7 @@ def builtin_item_type(tp: Type) -> Type | None:
             "builtins.list",
             "builtins.tuple",
             "builtins.dict",
+            "builtins.frozendict",
             "builtins.set",
             "builtins.frozenset",
             "_collections_abc.dict_keys",

mypy/checker.py

@@ -16,6 +16,7 @@
     ArgKind,
     Context,
     Expression,
+    FuncBase,
     FuncItem,
     LambdaExpr,
     MypyFile,
@@ -28,6 +29,7 @@
 from mypy.plugin import CheckerPluginInterface, Plugin
 from mypy.types import (
     CallableType,
+    FunctionLike,
     Instance,
     LiteralValue,
     Overloaded,
@@ -149,6 +151,10 @@ def expr_checker(self) -> ExpressionCheckerSharedApi:
     def named_type(self, name: str) -> Instance:
         raise NotImplementedError
 
+    @abstractmethod
+    def function_type(self, func: FuncBase) -> FunctionLike:
+        raise NotImplementedError
+
     @abstractmethod
     def lookup_typeinfo(self, fullname: str) -> TypeInfo:
         raise NotImplementedError

mypy/checker_shared.py

@@ -150,7 +150,6 @@
     false_only,
     fixup_partial_type,
     freeze_all_type_vars,
-    function_type,
     get_all_type_vars,
     get_type_vars,
     is_literal_type_like,
@@ -415,7 +414,7 @@ def analyze_static_reference(
         if isinstance(node, (Var, Decorator, OverloadedFuncDef)):
             return node.type or AnyType(TypeOfAny.special_form)
         elif isinstance(node, FuncDef):
-            return function_type(node, self.named_type("builtins.function"))
+            return self.chk.function_type(node)
         elif isinstance(node, TypeInfo):
             # Reference to a type object.
             if node.typeddict_type:

mypy/checkexpr.py

@@ -47,7 +47,6 @@
     bind_self,
     erase_to_bound,
     freeze_all_type_vars,
-    function_type,
     get_all_type_vars,
     make_simplified_union,
     supported_self_type,
@@ -360,7 +359,7 @@ def analyze_instance_member_access(
         if mx.is_lvalue and not mx.suppress_errors:
             mx.msg.cant_assign_to_method(mx.context)
         if not isinstance(method, OverloadedFuncDef):
-            signature = function_type(method, mx.named_type("builtins.function"))
+            signature = mx.chk.function_type(method)
         else:
             if method.type is None:
                 # Overloads may be not ready if they are decorated. Handle this in same
@@ -1325,7 +1324,7 @@ def analyze_class_attribute_access(
             return AnyType(TypeOfAny.from_error)
     else:
         assert isinstance(node.node, SYMBOL_FUNCBASE_TYPES)
-        typ = function_type(node.node, mx.named_type("builtins.function"))
+        typ = mx.chk.function_type(node.node)
         # Note: if we are accessing class method on class object, the cls argument is bound.
         # Annotated and/or explicit class methods go through other code paths above, for
         # unannotated implicit class methods we do this here.
@@ -1490,7 +1489,7 @@ def analyze_decorator_or_funcbase_access(
     """
     if isinstance(defn, Decorator):
         return analyze_var(name, defn.var, itype, mx)
-    typ = function_type(defn, mx.chk.named_type("builtins.function"))
+    typ = mx.chk.function_type(defn)
     if isinstance(defn, (FuncDef, OverloadedFuncDef)) and defn.is_trivial_self:
         return bind_self_fast(typ, mx.self_type)
     typ = check_self_arg(typ, mx.self_type, defn.is_class, mx.context, name, mx.msg)