Merge branch 'main' into docutils.readers

Author: danieleades

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/abc.pyi

@@ -3,7 +3,7 @@ import sys
 from _typeshed import SupportsWrite
 from collections.abc import Callable
 from typing import Any, Literal, TypeVar
-from typing_extensions import Concatenate, ParamSpec
+from typing_extensions import Concatenate, ParamSpec, deprecated
 
 _T = TypeVar("_T")
 _R_co = TypeVar("_R_co", covariant=True)
@@ -28,15 +28,17 @@ class ABCMeta(type):
     def register(cls: ABCMeta, subclass: type[_T]) -> type[_T]: ...
 
 def abstractmethod(funcobj: _FuncT) -> _FuncT: ...
-
+@deprecated("Deprecated, use 'classmethod' with 'abstractmethod' instead")
 class abstractclassmethod(classmethod[_T, _P, _R_co]):
     __isabstractmethod__: Literal[True]
     def __init__(self, callable: Callable[Concatenate[type[_T], _P], _R_co]) -> None: ...
 
+@deprecated("Deprecated, use 'staticmethod' with 'abstractmethod' instead")
 class abstractstaticmethod(staticmethod[_P, _R_co]):
     __isabstractmethod__: Literal[True]
     def __init__(self, callable: Callable[_P, _R_co]) -> None: ...
 
+@deprecated("Deprecated, use 'property' with 'abstractmethod' instead")
 class abstractproperty(property):
     __isabstractmethod__: Literal[True]
 

stdlib/sqlite3/dbapi2.pyi

@@ -221,16 +221,32 @@ def adapt(__obj: Any, __proto: Any) -> Any: ...
 @overload
 def adapt(__obj: Any, __proto: Any, __alt: _T) -> Any | _T: ...
 def complete_statement(statement: str) -> bool: ...
-def connect(
-    database: StrOrBytesPath,
-    timeout: float = ...,
-    detect_types: int = ...,
-    isolation_level: str | None = ...,
-    check_same_thread: bool = ...,
-    factory: type[Connection] | None = ...,
-    cached_statements: int = ...,
-    uri: bool = ...,
-) -> Connection: ...
+
+if sys.version_info >= (3, 12):
+    def connect(
+        database: StrOrBytesPath,
+        timeout: float = ...,
+        detect_types: int = ...,
+        isolation_level: str | None = ...,
+        check_same_thread: bool = ...,
+        factory: type[Connection] | None = ...,
+        cached_statements: int = ...,
+        uri: bool = ...,
+        autocommit: bool = ...,
+    ) -> Connection: ...
+
+else:
+    def connect(
+        database: StrOrBytesPath,
+        timeout: float = ...,
+        detect_types: int = ...,
+        isolation_level: str | None = ...,
+        check_same_thread: bool = ...,
+        factory: type[Connection] | None = ...,
+        cached_statements: int = ...,
+        uri: bool = ...,
+    ) -> Connection: ...
+
 def enable_callback_tracebacks(__enable: bool) -> None: ...
 
 if sys.version_info < (3, 12):
@@ -300,17 +316,32 @@ class Connection:
         def autocommit(self, val: int) -> None: ...
     row_factory: Any
     text_factory: Any
-    def __init__(
-        self,
-        database: StrOrBytesPath,
-        timeout: float = ...,
-        detect_types: int = ...,
-        isolation_level: str | None = ...,
-        check_same_thread: bool = ...,
-        factory: type[Connection] | None = ...,
-        cached_statements: int = ...,
-        uri: bool = ...,
-    ) -> None: ...
+    if sys.version_info >= (3, 12):
+        def __init__(
+            self,
+            database: StrOrBytesPath,
+            timeout: float = ...,
+            detect_types: int = ...,
+            isolation_level: str | None = ...,
+            check_same_thread: bool = ...,
+            factory: type[Connection] | None = ...,
+            cached_statements: int = ...,
+            uri: bool = ...,
+            autocommit: bool = ...,
+        ) -> None: ...
+    else:
+        def __init__(
+            self,
+            database: StrOrBytesPath,
+            timeout: float = ...,
+            detect_types: int = ...,
+            isolation_level: str | None = ...,
+            check_same_thread: bool = ...,
+            factory: type[Connection] | None = ...,
+            cached_statements: int = ...,
+            uri: bool = ...,
+        ) -> None: ...
+
     def close(self) -> None: ...
     if sys.version_info >= (3, 11):
         def blobopen(self, __table: str, __column: str, __row: int, *, readonly: bool = False, name: str = "main") -> Blob: ...

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