Merge branch 'main' into docutils.statemachine

Author: danieleades

.github/workflows/meta_tests.yml

@@ -64,7 +64,7 @@ jobs:
           file: "pyproject.toml"
           field: "tool.typeshed.pyright_version"
       - name: Run pyright on typeshed
-        uses: jakebailey/pyright-action@v2.0.2
+        uses: jakebailey/pyright-action@v2
         with:
           version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}

.github/workflows/tests.yml

@@ -158,22 +158,22 @@ jobs:
           file: "pyproject.toml"
           field: "tool.typeshed.pyright_version"
       - name: Run pyright with basic settings on all the stubs
-        uses: jakebailey/pyright-action@v2.0.2
+        uses: jakebailey/pyright-action@v2
         with:
           version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           no-comments: ${{ matrix.python-version != '3.11' || matrix.python-platform != 'Linux' }} # Having each job create the same comment is too noisy.
       - name: Run pyright with stricter settings on some of the stubs
-        uses: jakebailey/pyright-action@v2.0.2
+        uses: jakebailey/pyright-action@v2
         with:
           version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           no-comments: ${{ matrix.python-version != '3.11' || matrix.python-platform != 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.stricter.json
       - name: Run pyright on the test cases
-        uses: jakebailey/pyright-action@v2.0.2
+        uses: jakebailey/pyright-action@v2
         with:
           version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}

requirements-tests.txt

@@ -8,7 +8,7 @@ flake8-noqa==1.4.0       # must match .pre-commit-config.yaml
 flake8-pyi==24.1.0       # must match .pre-commit-config.yaml
 mypy==1.8.0
 pre-commit-hooks==4.5.0  # must match .pre-commit-config.yaml
-pytype==2024.2.13; platform_system != "Windows" and python_version < "3.12"
+pytype==2024.2.27; platform_system != "Windows" and python_version < "3.12"
 ruff==0.2.1              # must match .pre-commit-config.yaml and tests.yml
 
 # Libraries used by our various scripts.

stdlib/tarfile.pyi

@@ -7,7 +7,7 @@ from collections.abc import Callable, Iterable, Iterator, Mapping
 from gzip import _ReadableFileobj as _GzipReadableFileobj, _WritableFileobj as _GzipWritableFileobj
 from types import TracebackType
 from typing import IO, ClassVar, Literal, Protocol, overload
-from typing_extensions import Self, TypeAlias, deprecated
+from typing_extensions import Self, TypeAlias
 
 __all__ = [
     "TarFile",
@@ -292,49 +292,25 @@ class TarFile:
     def getnames(self) -> _list[str]: ...
     def list(self, verbose: bool = True, *, members: _list[TarInfo] | None = None) -> None: ...
     def next(self) -> TarInfo | None: ...
-    @overload
-    @deprecated(
-        "Extracting tar archives without specifying `filter` is deprecated until Python 3.14, when 'data' filter will become the default."
-    )
-    def extractall(
-        self,
-        path: StrOrBytesPath = ".",
-        members: Iterable[TarInfo] | None = None,
-        *,
-        numeric_owner: bool = False,
-        filter: None = ...,
-    ) -> None: ...
-    @overload
+    # Calling this method without `filter` is deprecated, but it may be set either on the class or in an
+    # individual call, so we can't mark it as @deprecated here.
     def extractall(
         self,
         path: StrOrBytesPath = ".",
         members: Iterable[TarInfo] | None = None,
         *,
         numeric_owner: bool = False,
-        filter: _TarfileFilter,
+        filter: _TarfileFilter | None = ...,
     ) -> None: ...
-    @overload
-    @deprecated(
-        "Extracting tar archives without specifying `filter` is deprecated until Python 3.14, when 'data' filter will become the default."
-    )
-    def extract(
-        self,
-        member: str | TarInfo,
-        path: StrOrBytesPath = "",
-        set_attrs: bool = True,
-        *,
-        numeric_owner: bool = False,
-        filter: None = ...,
-    ) -> None: ...
-    @overload
+    # Same situation as for `extractall`.
     def extract(
         self,
         member: str | TarInfo,
         path: StrOrBytesPath = "",
         set_attrs: bool = True,
         *,
         numeric_owner: bool = False,
-        filter: _TarfileFilter,
+        filter: _TarfileFilter | None = ...,
     ) -> None: ...
     def _extract_member(
         self, tarinfo: TarInfo, targetpath: str, set_attrs: bool = True, numeric_owner: bool = False

stubs/beautifulsoup4/bs4/element.pyi

@@ -234,7 +234,7 @@ class Tag(PageElement):
     sourceline: int | None
     sourcepos: int | None
     known_xml: bool | None
-    attrs: dict[str, str]
+    attrs: dict[str, str | Any]
     contents: list[PageElement]
     hidden: bool
     can_be_empty_element: bool | None

stubs/html5lib/html5lib/_inputstream.pyi

@@ -11,7 +11,7 @@ class _Encoding(Protocol):
 
 _UnicodeInputStream: TypeAlias = str | SupportsRead[str]
 _BinaryInputStream: TypeAlias = bytes | SupportsRead[bytes]
-_InputStream: TypeAlias = _UnicodeInputStream  # noqa: Y047  # used in other files
+_InputStream: TypeAlias = _UnicodeInputStream | _BinaryInputStream  # noqa: Y047  # used in other files
 
 spaceCharactersBytes: Any
 asciiLettersBytes: Any

stubs/lzstring/@tests/stubtest_allowlist.txt

@@ -0,0 +1,6 @@
+# Internal implementation details that are intentionally missing from stub
+lzstring.keyStrBase64
+lzstring.keyStrUriSafe
+lzstring.baseReverseDic
+lzstring.Object
+lzstring.getBaseValue

stubs/lzstring/METADATA.toml

@@ -0,0 +1,2 @@
+version = "1.0.*"
+upstream_repository = "https://github.com/gkovacs/lz-string-python"

stubs/lzstring/lzstring/__init__.pyi

@@ -0,0 +1,17 @@
+class LZString:
+    @staticmethod
+    def compress(uncompressed: str | None) -> str: ...
+    @staticmethod
+    def compressToUTF16(uncompressed: str | None) -> str: ...
+    @staticmethod
+    def compressToBase64(uncompressed: str | None) -> str: ...
+    @staticmethod
+    def compressToEncodedURIComponent(uncompressed: str | None) -> str: ...
+    @staticmethod
+    def decompress(compressed: str | None) -> str | None: ...
+    @staticmethod
+    def decompressFromUTF16(compressed: str | None) -> str | None: ...
+    @staticmethod
+    def decompressFromBase64(compressed: str | None) -> str | None: ...
+    @staticmethod
+    def decompressFromEncodedURIComponent(compressed: str | None) -> str | None: ...

stubs/pyOpenSSL/OpenSSL/SSL.pyi

@@ -24,6 +24,9 @@ TLSv1_2_METHOD: int
 TLS_METHOD: int
 TLS_SERVER_METHOD: int
 TLS_CLIENT_METHOD: int
+DTLS_METHOD: int
+DTLS_SERVER_METHOD: int
+DTLS_CLIENT_METHOD: int
 
 SSL3_VERSION: int
 TLS1_VERSION: int