Merge branch 'main' into functools-cache

Author: srittau

pyrightconfig.stricter.json

@@ -44,7 +44,6 @@
         "stubs/grpcio-reflection/grpc_reflection/v1alpha",
         "stubs/grpcio-status/grpc_status",
         "stubs/grpcio/grpc/__init__.pyi",
-        "stubs/gunicorn",
         "stubs/hdbcli/hdbcli/dbapi.pyi",
         "stubs/html5lib",
         "stubs/httplib2",

stdlib/@tests/test_cases/check_types.py

@@ -3,9 +3,11 @@
 import sys
 import types
 from collections import UserDict
-from typing import Union
+from typing import Any, Literal, TypeVar, Union
 from typing_extensions import assert_type
 
+_T = TypeVar("_T")
+
 # test `types.SimpleNamespace`
 
 # Valid:
@@ -58,3 +60,13 @@ def foo(self, value: int) -> None:
     @foo.deleter
     def foo(self) -> None:
         self._value = None
+
+
+if sys.version_info > (3, 10):
+    union_type = int | list[_T]
+
+    # ideally this would be `_SpecialForm` (Union)
+    assert_type(union_type | Literal[1], types.UnionType | Any)
+    # Both mypy and pyright special-case this operation,
+    # but in different ways, so we just check that no error is emitted:
+    _ = union_type[int]

stdlib/curses/__init__.pyi

@@ -14,8 +14,9 @@ _T = TypeVar("_T")
 _P = ParamSpec("_P")
 
 # available after calling `curses.initscr()`
-LINES: Final[int]
-COLS: Final[int]
+# not `Final` as it can change during the terminal resize:
+LINES: int
+COLS: int
 
 # available after calling `curses.start_color()`
 COLORS: Final[int]

stdlib/dbm/sqlite3.pyi

@@ -26,4 +26,4 @@ class _Database(MutableMapping[bytes, bytes]):
     def __enter__(self) -> Self: ...
     def __exit__(self, *args: Unused) -> None: ...
 
-def open(filename: StrOrBytesPath, /, flag: Literal["r", "w,", "c", "n"] = "r", mode: int = 0o666) -> _Database: ...
+def open(filename: StrOrBytesPath, /, flag: Literal["r", "w", "c", "n"] = "r", mode: int = 0o666) -> _Database: ...

stdlib/importlib/resources/_common.pyi

@@ -21,7 +21,7 @@ if sys.version_info >= (3, 11):
         @overload
         def files(anchor: Anchor | None = None) -> Traversable: ...
         @overload
-        @deprecated("First parameter to files is renamed to 'anchor'")
+        @deprecated("Deprecated since Python 3.12; will be removed in Python 3.15. Use `anchor` parameter instead.")
         def files(package: Anchor | None = None) -> Traversable: ...
 
     else: