Merge branch 'master' into default-strict-bytes

Author: JelleZijlstra

.github/workflows/test.yml

@@ -94,8 +94,8 @@ jobs:
         # This is broken. See
         # - https://github.com/python/mypy/issues/17819
         # - https://github.com/python/mypy/pull/17822
-        # - name: mypyc runtime tests with py38-debug-build-ubuntu
-        #   python: '3.9.21'
+        # - name: mypyc runtime tests with py310-debug-build-ubuntu
+        #   python: '3.10'
         #   os: ubuntu-latest
         #   toxenv: py
         #   tox_extra_args: "-n 4 mypyc/test/test_run.py mypyc/test/test_external.py"
@@ -152,24 +152,15 @@ jobs:
       with:
         persist-credentials: false
 
-    - name: Debug build
-      if: ${{ matrix.debug_build }}
-      run: |
-        PYTHONVERSION=${{ matrix.python }}
-        PYTHONDIR=~/python-debug/python-$PYTHONVERSION
-        VENV=$PYTHONDIR/env
-        ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
-        # TODO: does this do anything? env vars aren't passed to the next step right
-        source $VENV/bin/activate
     - name: Latest dev build
       if: ${{ endsWith(matrix.python, '-dev') }}
       run: |
           git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch $( echo ${{ matrix.python }} | sed 's/-dev//' )
           cd /tmp/cpython
           echo git rev-parse HEAD; git rev-parse HEAD
           git show --no-patch
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
+          sudo apt-get update -q
+          sudo apt-get install -q -y --no-install-recommends \
             build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
             libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
           ./configure --prefix=/opt/pythondev
@@ -178,6 +169,23 @@ jobs:
           sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
           sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
           echo "/opt/pythondev/bin" >> $GITHUB_PATH
+    - name: Debug build
+      if: ${{ matrix.debug_build }}
+      run: |
+          git clone --depth 1 https://github.com/python/cpython.git /tmp/cpython --branch ${{ matrix.python }}
+          cd /tmp/cpython
+          echo git rev-parse HEAD; git rev-parse HEAD
+          git show --no-patch
+          sudo apt-get update -q
+          sudo apt-get install -q -y --no-install-recommends \
+            build-essential gdb lcov libbz2-dev libffi-dev libgdbm-dev liblzma-dev libncurses5-dev \
+            libreadline6-dev libsqlite3-dev libssl-dev lzma lzma-dev tk-dev uuid-dev zlib1g-dev
+          ./configure CFLAGS="-DPy_DEBUG -DPy_TRACE_REFS -DPYMALLOC_DEBUG" --with-pydebug -with-trace-refs --prefix=/opt/pythondev
+          make -j$(nproc)
+          sudo make install
+          sudo ln -s /opt/pythondev/bin/python3 /opt/pythondev/bin/python
+          sudo ln -s /opt/pythondev/bin/pip3 /opt/pythondev/bin/pip
+          echo "/opt/pythondev/bin" >> $GITHUB_PATH
     - uses: actions/setup-python@v5
       if: ${{ !(matrix.debug_build || endsWith(matrix.python, '-dev')) }}
       with:

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.9.0
+    rev: 26.1.0
     hooks:
       - id: black
         exclude: '^(test-data/)'

docs/source/command_line.rst

@@ -537,13 +537,15 @@ potentially problematic or redundant in some way.
                 print(x + "bad")
 
     To help prevent mypy from generating spurious warnings, the "Statement is
-    unreachable" warning will be silenced in exactly two cases:
+    unreachable" warning will be silenced in exactly three cases:
 
     1.  When the unreachable statement is a ``raise`` statement, is an
         ``assert False`` statement, or calls a function that has the :py:data:`~typing.NoReturn`
         return type hint. In other words, when the unreachable statement
         throws an error or terminates the program in some way.
-    2.  When the unreachable statement was *intentionally* marked as unreachable
+    2.  When the unreachable statement is ``return NotImplemented``. This
+        is allowed by mypy due to its use in operator overloading.
+    3.  When the unreachable statement was *intentionally* marked as unreachable
         using :ref:`version_and_platform_checks`.
 
     .. note::

docs/source/error_code_list2.rst

@@ -32,7 +32,7 @@ Example:
 
     # mypy: disallow-any-generics
 
-    # Error: Missing type parameters for generic type "list"  [type-arg]
+    # Error: Missing type arguments for generic type "list"  [type-arg]
     def remove_dups(items: list) -> list:
         ...
 

docs/source/type_inference_and_annotations.rst

@@ -159,7 +159,7 @@ on the declared type of ``arg`` in ``foo``:
 .. code-block:: python
 
     def foo(arg: list[int]) -> None:
-        print('Items:', ''.join(str(a) for a in arg))
+        print('Items:', ', '.join(str(a) for a in arg))
 
     foo([])  # OK
 
@@ -170,7 +170,7 @@ in the following statement:
 .. code-block:: python
 
     def foo(arg: list[int]) -> None:
-        print('Items:', ', '.join(arg))
+        print('Items:', ', '.join(str(a) for a in arg))
 
     a = []  # Error: Need type annotation for "a"
     foo(a)

misc/sync-typeshed.py

@@ -184,14 +184,12 @@ def main() -> None:
         assert commit
 
         # Create a commit
-        message = textwrap.dedent(
-            f"""\
+        message = textwrap.dedent(f"""\
             Sync typeshed
 
             Source commit:
             https://github.com/python/typeshed/commit/{commit}
-            """
-        )
+            """)
         subprocess.run(["git", "add", "--all", os.path.join("mypy", "typeshed")], check=True)
         subprocess.run(["git", "commit", "-m", message], check=True)
         print("Created typeshed sync commit.")

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

@@ -1,4 +1,4 @@
-From 84a9d586544a0408d4654f57f83a93cb048070fb Mon Sep 17 00:00:00 2001
+From b6d495c10e79fb56ff64f8fb90c87894090f9cbe Mon Sep 17 00:00:00 2001
 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 Date: Sat, 15 Feb 2025 20:11:06 +0100
 Subject: [PATCH] Partially revert Clean up argparse hacks
@@ -8,7 +8,7 @@ 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 b9fa31139..3c3ba116a 100644
+index ae99eb036..c87b8f4fc 100644
 --- a/mypy/typeshed/stdlib/argparse.pyi
 +++ b/mypy/typeshed/stdlib/argparse.pyi
 @@ -2,7 +2,7 @@ import sys
@@ -41,5 +41,5 @@ index b9fa31139..3c3ba116a 100644
          default: Any = ...,
          type: _ActionType = ...,
 -- 
-2.50.1
+2.52.0
 

misc/typeshed_patches/0001-Remove-use-of-LiteralString-in-builtins-13743.patch

@@ -1,4 +1,4 @@
-From 3229a6066cff3d80d6cb923322c2d42a300d0be3 Mon Sep 17 00:00:00 2001
+From ed11d7e0204868ef1a43c17ed950372b1d78f497 Mon Sep 17 00:00:00 2001
 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
 Date: Mon, 26 Sep 2022 12:55:07 -0700
 Subject: [PATCH] Remove use of LiteralString in builtins (#13743)
@@ -8,18 +8,18 @@ Subject: [PATCH] Remove use of LiteralString in builtins (#13743)
  1 file changed, 1 insertion(+), 99 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index 969d16876..044e264d2 100644
+index 693dd0b77..8acdeadff 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -63,7 +63,6 @@ from typing import (  # noqa: Y022,UP035
+@@ -64,7 +64,6 @@ from typing import (  # noqa: Y022,UP035
  from typing_extensions import (  # noqa: Y023
      Concatenate,
      Literal,
 -    LiteralString,
      ParamSpec,
      Self,
      TypeAlias,
-@@ -480,31 +479,16 @@ class str(Sequence[str]):
+@@ -482,31 +481,16 @@ class str(Sequence[str]):
      def __new__(cls, object: object = "") -> Self: ...
      @overload
      def __new__(cls, object: ReadableBuffer, encoding: str = "utf-8", errors: str = "strict") -> Self: ...
@@ -51,7 +51,7 @@ index 969d16876..044e264d2 100644
      def format(self, *args: object, **kwargs: object) -> str: ...
      def format_map(self, mapping: _FormatMapMapping, /) -> str: ...
      def index(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
-@@ -520,98 +504,34 @@ class str(Sequence[str]):
+@@ -522,98 +506,34 @@ class str(Sequence[str]):
      def isspace(self) -> bool: ...
      def istitle(self) -> bool: ...
      def isupper(self) -> bool: ...
@@ -150,7 +150,7 @@ index 969d16876..044e264d2 100644
      def zfill(self, width: SupportsIndex, /) -> str: ...  # type: ignore[misc]
      @staticmethod
      @overload
-@@ -622,39 +542,21 @@ class str(Sequence[str]):
+@@ -624,39 +544,21 @@ class str(Sequence[str]):
      @staticmethod
      @overload
      def maketrans(x: str, y: str, z: str, /) -> dict[int, int | None]: ...
@@ -192,5 +192,5 @@ index 969d16876..044e264d2 100644
      def __getnewargs__(self) -> tuple[str]: ...
      def __format__(self, format_spec: str, /) -> str: ...
 -- 
-2.51.1
+2.52.0
 

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

@@ -1,4 +1,4 @@
-From 7678bc3f80e4d3f04a0ff0ee3a7d51f49ae4c465 Mon Sep 17 00:00:00 2001
+From 69791281c2c5e919cea9a77c4a771f79d9e70384 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
@@ -36,10 +36,10 @@ index d663f5d93..f43178e4d 100644
      @property
      def _exception(self) -> BaseException | None: ...
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index 044e264d2..6d813f172 100644
+index 8acdeadff..5a3bb5908 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1210,7 +1210,7 @@ class frozenset(AbstractSet[_T_co]):
+@@ -1226,7 +1226,7 @@ class frozenset(AbstractSet[_T_co]):
      def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
  @disjoint_base
@@ -48,7 +48,7 @@ index 044e264d2..6d813f172 100644
      def __new__(cls, iterable: Iterable[_T], start: int = 0) -> Self: ...
      def __iter__(self) -> Self: ...
      def __next__(self) -> tuple[int, _T]: ...
-@@ -1404,7 +1404,7 @@ else:
+@@ -1413,7 +1413,7 @@ else:
  exit: _sitebuiltins.Quitter
 
  @disjoint_base
@@ -57,7 +57,7 @@ index 044e264d2..6d813f172 100644
      @overload
      def __new__(cls, function: None, iterable: Iterable[_T | None], /) -> Self: ...
      @overload
-@@ -1468,7 +1468,7 @@ license: _sitebuiltins._Printer
+@@ -1477,7 +1477,7 @@ license: _sitebuiltins._Printer
 
  def locals() -> dict[str, Any]: ...
  @disjoint_base
@@ -66,7 +66,7 @@ index 044e264d2..6d813f172 100644
      # 3.14 adds `strict` argument.
      if sys.version_info >= (3, 14):
          @overload
-@@ -1775,7 +1775,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
+@@ -1784,7 +1784,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
  quit: _sitebuiltins.Quitter
 
  @disjoint_base
@@ -75,7 +75,7 @@ index 044e264d2..6d813f172 100644
      @overload
      def __new__(cls, sequence: Reversible[_T], /) -> Iterator[_T]: ...  # type: ignore[misc]
      @overload
-@@ -1839,7 +1839,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
+@@ -1848,7 +1848,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
  @overload
  def vars(object: Any = ..., /) -> dict[str, Any]: ...
  @disjoint_base
@@ -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 910d63814..eb942bc55 100644
+index 6778b7648..95164de2f 100644
 --- a/mypy/typeshed/stdlib/fileinput.pyi
 +++ b/mypy/typeshed/stdlib/fileinput.pyi
 @@ -1,8 +1,8 @@
@@ -118,7 +118,7 @@ index 910d63814..eb942bc55 100644
  from types import GenericAlias, TracebackType
 -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
+ from typing_extensions import Self, TypeAlias, deprecated
 
  __all__ = [
 @@ -105,7 +105,7 @@ def fileno() -> int: ...
@@ -131,7 +131,7 @@ index 910d63814..eb942bc55 100644
          # encoding and errors are added
          @overload
 diff --git a/mypy/typeshed/stdlib/itertools.pyi b/mypy/typeshed/stdlib/itertools.pyi
-index fe4ccbdf8..73745fe92 100644
+index 8a924ad8b..5c2bf7f83 100644
 --- a/mypy/typeshed/stdlib/itertools.pyi
 +++ b/mypy/typeshed/stdlib/itertools.pyi
 @@ -28,7 +28,7 @@ _Predicate: TypeAlias = Callable[[_T], object]
@@ -166,7 +166,7 @@ index fe4ccbdf8..73745fe92 100644
 -class accumulate(Generic[_T]):
 +class accumulate(Iterator[_T]):
      @overload
-     def __new__(cls, iterable: Iterable[_T], func: None = None, *, initial: _T | None = ...) -> Self: ...
+     def __new__(cls, iterable: Iterable[_T], func: None = None, *, initial: _T | None = None) -> Self: ...
      @overload
 @@ -64,7 +64,7 @@ class accumulate(Generic[_T]):
      def __next__(self) -> _T: ...
@@ -239,7 +239,7 @@ index fe4ccbdf8..73745fe92 100644
 +class zip_longest(Iterator[_T_co]):
      # one iterable (fillvalue doesn't matter)
      @overload
-     def __new__(cls, iter1: Iterable[_T1], /, *, fillvalue: object = ...) -> zip_longest[tuple[_T1]]: ...
+     def __new__(cls, iter1: Iterable[_T1], /, *, fillvalue: object = None) -> zip_longest[tuple[_T1]]: ...
 @@ -202,7 +202,7 @@ class zip_longest(Generic[_T_co]):
      def __next__(self) -> _T_co: ...
 
@@ -291,8 +291,8 @@ index fe4ccbdf8..73745fe92 100644
 -    class batched(Generic[_T_co]):
 +    class batched(Iterator[tuple[_T_co, ...]], Generic[_T_co]):
          if sys.version_info >= (3, 13):
-             def __new__(cls, iterable: Iterable[_T_co], n: int, *, strict: bool = False) -> Self: ...
-         else:
+             @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
 --- a/mypy/typeshed/stdlib/multiprocessing/pool.pyi
@@ -313,10 +313,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 6b0f1ba94..882cd143c 100644
+index 04b978b1b..e4604144f 100644
 --- a/mypy/typeshed/stdlib/sqlite3/__init__.pyi
 +++ b/mypy/typeshed/stdlib/sqlite3/__init__.pyi
-@@ -407,7 +407,7 @@ class Connection:
+@@ -408,7 +408,7 @@ class Connection:
      ) -> Literal[False]: ...
 
  @disjoint_base
@@ -326,5 +326,5 @@ index 6b0f1ba94..882cd143c 100644
      @property
      def connection(self) -> Connection: ...
 -- 
-2.51.1
+2.52.0
 

misc/typeshed_patches/0001-Revert-sum-literal-integer-change-13961.patch

@@ -1,4 +1,4 @@
-From 16b0b50ec77e470f24145071acde5274a1de53a0 Mon Sep 17 00:00:00 2001
+From 0e30b762e8335f02e19977c055ac7b98e707991c Mon Sep 17 00:00:00 2001
 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
 Date: Sat, 29 Oct 2022 12:47:21 -0700
 Subject: [PATCH] Revert sum literal integer change (#13961)
@@ -19,10 +19,10 @@ within mypy, I might pursue upstreaming this in typeshed.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index 900c4c93f..d874edd8f 100644
+index 5a3bb5908..0f2196070 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1782,7 +1782,7 @@ _SupportsSumNoDefaultT = TypeVar("_SupportsSumNoDefaultT", bound=_SupportsSumWit
+@@ -1835,7 +1835,7 @@ _SupportsSumNoDefaultT = TypeVar("_SupportsSumNoDefaultT", bound=_SupportsSumWit
  # without creating many false-positive errors (see #7578).
  # Instead, we special-case the most common examples of this: bool and literal integers.
  @overload
@@ -32,5 +32,5 @@ index 900c4c93f..d874edd8f 100644
  def sum(iterable: Iterable[_SupportsSumNoDefaultT], /) -> _SupportsSumNoDefaultT | Literal[0]: ...
  @overload
 -- 
-2.49.0
+2.52.0