Merge branch 'main' into fpdf2-2.8.5

Author: srittau

pyrightconfig.json

@@ -28,8 +28,6 @@
     // No effect in stubs
     "reportMissingSuperCall": "none",
     "reportUninitializedInstanceVariable": "none",
-    // stdlib stubs trigger reportShadowedImports
-    "reportShadowedImports": "none",
     // Stubs are allowed to use private variables
     "reportPrivateUsage": "none",
     // Stubs don't need the actual modules to be installed

pyrightconfig.scripts_and_tests.json

@@ -14,7 +14,6 @@
     "reportImplicitStringConcatenation": "none",
     // Extra strict settings
     "reportMissingModuleSource": "error",
-    "reportShadowedImports": "error",
     "reportCallInDefaultInitializer": "error",
     "reportPropertyTypeMismatch": "error",
     "reportUninitializedInstanceVariable": "error",

pyrightconfig.stricter.json

@@ -30,6 +30,7 @@
         "stubs/boltons",
         "stubs/braintree",
         "stubs/cffi",
+        "stubs/colorful",
         "stubs/dateparser",
         "stubs/defusedxml",
         "stubs/docker",
@@ -79,7 +80,6 @@
         "stubs/PyMySQL",
         "stubs/python-dateutil",
         "stubs/python-jose",
-        "stubs/pytz/pytz/lazy.pyi",
         "stubs/pywin32",
         "stubs/PyYAML",
         "stubs/reportlab",
@@ -108,8 +108,6 @@
     // No effect in stubs
     "reportMissingSuperCall": "none",
     "reportUninitializedInstanceVariable": "none",
-    // stdlib stubs trigger reportShadowedImports
-    "reportShadowedImports": "none",
     // Stubs are allowed to use private variables
     "reportPrivateUsage": "none",
     // Stubs don't need the actual modules to be installed

pyrightconfig.testcases.json

@@ -6,7 +6,6 @@
     ],
     "typeCheckingMode": "strict",
     // Extra strict settings
-    "reportShadowedImports": "error", // Don't accidentally name a file something that shadows stdlib
     "reportImplicitStringConcatenation": "error",
     "reportUninitializedInstanceVariable": "error",
     "reportUnnecessaryTypeIgnoreComment": "error",

stdlib/@tests/stubtest_allowlists/darwin.txt

@@ -53,9 +53,6 @@ multiprocessing.popen_spawn_win32  # exists on Darwin but fails to import
 readline.append_history_file  # Only available if compiled with GNU readline, not editline
 select.poll  # Actually a function; we have a class so it can be used as a type
 
-# Some of these exist on non-windows, but they are useless and this is not intended
-stat.FILE_ATTRIBUTE_[A-Z_]+
-
 tkinter.Tk.createfilehandler  # Methods that come from __getattr__() at runtime
 tkinter.Tk.deletefilehandler  # Methods that come from __getattr__() at runtime
 

stdlib/@tests/stubtest_allowlists/linux.txt

@@ -54,9 +54,6 @@ _?socket.SOL_IPX
 _?socket.SOL_NETROM
 _?socket.SOL_ROSE
 
-# Some of these exist on non-windows, but they are useless and this is not intended
-stat.FILE_ATTRIBUTE_[A-Z_]+
-
 # This is available on Linux, but it's documented as for kernel debugging and
 # not present on GitHub Actions runners.
 termios.TIOCTTYGSTRUCT

stdlib/@tests/test_cases/check_compression.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+import io
+import sys
+from _typeshed import ReadableBuffer
+from bz2 import BZ2Decompressor
+from lzma import LZMADecompressor
+from typing import cast
+from typing_extensions import assert_type
+from zlib import decompressobj
+
+if sys.version_info >= (3, 14):
+    from compression._common._streams import DecompressReader, _Decompressor, _Reader
+    from compression.zstd import ZstdDecompressor
+else:
+    from _compression import DecompressReader, _Decompressor, _Reader
+
+###
+# Tests for DecompressReader/_Decompressor
+###
+
+
+class CustomDecompressor:
+    def decompress(self, data: ReadableBuffer, max_length: int = -1) -> bytes:
+        return b""
+
+    @property
+    def unused_data(self) -> bytes:
+        return b""
+
+    @property
+    def eof(self) -> bool:
+        return False
+
+    @property
+    def needs_input(self) -> bool:
+        return False
+
+
+def accept_decompressor(d: _Decompressor) -> None:
+    d.decompress(b"random bytes", 0)
+    assert_type(d.eof, bool)
+    assert_type(d.unused_data, bytes)
+
+
+fp = cast(_Reader, io.BytesIO(b"hello world"))
+DecompressReader(fp, decompressobj)
+DecompressReader(fp, BZ2Decompressor)
+DecompressReader(fp, LZMADecompressor)
+DecompressReader(fp, CustomDecompressor)
+accept_decompressor(decompressobj())
+accept_decompressor(BZ2Decompressor())
+accept_decompressor(LZMADecompressor())
+accept_decompressor(CustomDecompressor())
+
+if sys.version_info >= (3, 14):
+    DecompressReader(fp, ZstdDecompressor)
+    accept_decompressor(ZstdDecompressor())

stdlib/_compression.pyi

@@ -1,6 +1,6 @@
 # _compression is replaced by compression._common._streams on Python 3.14+ (PEP-784)
 
-from _typeshed import Incomplete, WriteableBuffer
+from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Callable
 from io import DEFAULT_BUFFER_SIZE, BufferedIOBase, RawIOBase
 from typing import Any, Protocol, type_check_only
@@ -13,13 +13,24 @@ class _Reader(Protocol):
     def seekable(self) -> bool: ...
     def seek(self, n: int, /) -> Any: ...
 
+@type_check_only
+class _Decompressor(Protocol):
+    def decompress(self, data: ReadableBuffer, /, max_length: int = ...) -> bytes: ...
+    @property
+    def unused_data(self) -> bytes: ...
+    @property
+    def eof(self) -> bool: ...
+    # `zlib._Decompress` does not have next property, but `DecompressReader` calls it:
+    # @property
+    # def needs_input(self) -> bool: ...
+
 class BaseStream(BufferedIOBase): ...
 
 class DecompressReader(RawIOBase):
     def __init__(
         self,
         fp: _Reader,
-        decomp_factory: Callable[..., Incomplete],
+        decomp_factory: Callable[..., _Decompressor],
         trailing_error: type[Exception] | tuple[type[Exception], ...] = (),
         **decomp_args: Any,  # These are passed to decomp_factory.
     ) -> None: ...

stdlib/compression/_common/_streams.pyi

@@ -1,4 +1,4 @@
-from _typeshed import Incomplete, WriteableBuffer
+from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Callable
 from io import DEFAULT_BUFFER_SIZE, BufferedIOBase, RawIOBase
 from typing import Any, Protocol, type_check_only
@@ -11,13 +11,24 @@ class _Reader(Protocol):
     def seekable(self) -> bool: ...
     def seek(self, n: int, /) -> Any: ...
 
+@type_check_only
+class _Decompressor(Protocol):
+    def decompress(self, data: ReadableBuffer, /, max_length: int = ...) -> bytes: ...
+    @property
+    def unused_data(self) -> bytes: ...
+    @property
+    def eof(self) -> bool: ...
+    # `zlib._Decompress` does not have next property, but `DecompressReader` calls it:
+    # @property
+    # def needs_input(self) -> bool: ...
+
 class BaseStream(BufferedIOBase): ...
 
 class DecompressReader(RawIOBase):
     def __init__(
         self,
         fp: _Reader,
-        decomp_factory: Callable[..., Incomplete],  # Consider backporting changes to _compression
+        decomp_factory: Callable[..., _Decompressor],  # Consider backporting changes to _compression
         trailing_error: type[Exception] | tuple[type[Exception], ...] = (),
         **decomp_args: Any,  # These are passed to decomp_factory.
     ) -> None: ...

stdlib/http/client.pyi

@@ -166,6 +166,7 @@ class HTTPResponse(io.BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incomp
     def begin(self) -> None: ...
 
 class HTTPConnection:
+    blocksize: int
     auto_open: int  # undocumented
     debuglevel: int
     default_port: int  # undocumented