Drop Python 3.8 branches (#13776)

Author: srittau

stdlib/@tests/test_cases/check_importlib.py

@@ -10,14 +10,14 @@
 from types import ModuleType
 from typing_extensions import Self
 
+
 # Assert that some Path classes are Traversable.
-if sys.version_info >= (3, 9):
+def traverse(t: importlib.abc.Traversable) -> None:
+    pass
 
-    def traverse(t: importlib.abc.Traversable) -> None:
-        pass
 
-    traverse(pathlib.Path())
-    traverse(zipfile.Path(""))
+traverse(pathlib.Path())
+traverse(zipfile.Path(""))
 
 
 class MetaFinder:

stdlib/@tests/test_cases/check_platform.py

@@ -1,16 +1,12 @@
 from __future__ import annotations
 
 import platform
-import sys
 from typing_extensions import assert_type
 
 # platform.uname_result emulates a 6 field named tuple, but on 3.9+ the processor
 # field is lazily evaluated, which results in it being a little funky.
 uname = platform.uname()
-if sys.version_info >= (3, 9):
-    myuname = platform.uname_result("Darwin", "local", "22.5.0", "Darwin Kernel Version 22.5.0", "arm64")
-else:
-    myuname = platform.uname_result("Darwin", "local", "22.5.0", "Darwin Kernel Version 22.5.0", "arm64", "arm")
+myuname = platform.uname_result("Darwin", "local", "22.5.0", "Darwin Kernel Version 22.5.0", "arm64")
 
 assert_type(uname, platform.uname_result)
 assert_type(myuname, platform.uname_result)

stdlib/@tests/test_cases/check_xml.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import sys
 from typing_extensions import assert_type
 from xml.dom.minidom import Document
 
@@ -10,10 +9,9 @@
 assert_type(document.toxml(encoding=None), str)
 assert_type(document.toxml(encoding="UTF8"), bytes)
 assert_type(document.toxml("UTF8"), bytes)
-if sys.version_info >= (3, 9):
-    assert_type(document.toxml(standalone=True), str)
-    assert_type(document.toxml("UTF8", True), bytes)
-    assert_type(document.toxml(encoding="UTF8", standalone=True), bytes)
+assert_type(document.toxml(standalone=True), str)
+assert_type(document.toxml("UTF8", True), bytes)
+assert_type(document.toxml(encoding="UTF8", standalone=True), bytes)
 
 
 # Because toprettyxml can mix positional and keyword variants of the "encoding" argument, which
@@ -23,13 +21,11 @@
 assert_type(document.toprettyxml(), str)
 assert_type(document.toprettyxml(encoding=None), str)
 assert_type(document.toprettyxml(encoding="UTF8"), bytes)
-if sys.version_info >= (3, 9):
-    assert_type(document.toprettyxml(standalone=True), str)
-    assert_type(document.toprettyxml(encoding="UTF8", standalone=True), bytes)
+assert_type(document.toprettyxml(standalone=True), str)
+assert_type(document.toprettyxml(encoding="UTF8", standalone=True), bytes)
 # Test cases unique to toprettyxml
 assert_type(document.toprettyxml("  "), str)
 assert_type(document.toprettyxml("  ", "\r\n"), str)
 assert_type(document.toprettyxml("  ", "\r\n", "UTF8"), bytes)
-if sys.version_info >= (3, 9):
-    assert_type(document.toprettyxml("  ", "\r\n", "UTF8", True), bytes)
-    assert_type(document.toprettyxml("  ", "\r\n", standalone=True), str)
+assert_type(document.toprettyxml("  ", "\r\n", "UTF8", True), bytes)
+assert_type(document.toprettyxml("  ", "\r\n", standalone=True), str)

stdlib/@tests/test_cases/collections/check_defaultdict-py39.py

@@ -0,0 +1,70 @@
+"""
+Tests for `defaultdict.__or__` and `defaultdict.__ror__`.
+"""
+
+from __future__ import annotations
+
+import os
+from collections import defaultdict
+from typing import Mapping, TypeVar, Union
+from typing_extensions import Self, assert_type
+
+_KT = TypeVar("_KT")
+_VT = TypeVar("_VT")
+
+
+class CustomDefaultDictSubclass(defaultdict[_KT, _VT]):
+    pass
+
+
+class CustomMappingWithDunderOr(Mapping[_KT, _VT]):
+    def __or__(self, other: Mapping[_KT, _VT]) -> dict[_KT, _VT]:
+        return {}
+
+    def __ror__(self, other: Mapping[_KT, _VT]) -> dict[_KT, _VT]:
+        return {}
+
+    def __ior__(self, other: Mapping[_KT, _VT]) -> Self:
+        return self
+
+
+def test_defaultdict_dot_or(
+    a: defaultdict[int, int],
+    b: CustomDefaultDictSubclass[int, int],
+    c: defaultdict[str, str],
+    d: Mapping[int, int],
+    e: CustomMappingWithDunderOr[str, str],
+) -> None:
+    assert_type(a | b, defaultdict[int, int])
+
+    # In contrast to `dict.__or__`, `defaultdict.__or__` returns `Self` if called on a subclass of `defaultdict`:
+    assert_type(b | a, CustomDefaultDictSubclass[int, int])
+
+    assert_type(a | c, defaultdict[Union[int, str], Union[int, str]])
+
+    # arbitrary mappings are not accepted by `defaultdict.__or__`;
+    # it has to be a subclass of `dict`
+    a | d  # type: ignore
+
+    # but Mappings such as `os._Environ` or `CustomMappingWithDunderOr`,
+    # which define `__ror__` methods that accept `dict`, are fine
+    # (`os._Environ.__(r)or__` always returns `dict`, even if a `defaultdict` is passed):
+    assert_type(a | os.environ, dict[Union[str, int], Union[str, int]])
+    assert_type(os.environ | a, dict[Union[str, int], Union[str, int]])
+
+    assert_type(c | os.environ, dict[str, str])
+    assert_type(c | e, dict[str, str])
+
+    assert_type(os.environ | c, dict[str, str])
+    assert_type(e | c, dict[str, str])
+
+    # store "untainted" `CustomMappingWithDunderOr[str, str]` to test `__ior__` against ` defaultdict[str, str]` later
+    # Invalid `e |= a` causes pyright to join `Unknown` to `e`'s type
+    f = e
+
+    e |= c
+    e |= a  # type: ignore
+
+    c |= f
+
+    c |= a  # type: ignore

stdlib/@tests/test_cases/collections/check_defaultdict.py

@@ -4,12 +4,10 @@ from _typeshed import ReadableBuffer, StrOrBytesPath, WriteableBuffer
 from abc import abstractmethod
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from ctypes import CDLL, ArgumentError as ArgumentError, c_void_p
+from types import GenericAlias
 from typing import Any, ClassVar, Generic, TypeVar, final, overload, type_check_only
 from typing_extensions import Self, TypeAlias
 
-if sys.version_info >= (3, 9):
-    from types import GenericAlias
-
 _T = TypeVar("_T")
 _CT = TypeVar("_CT", bound=_CData)
 
@@ -317,8 +315,7 @@ class Array(_CData, Generic[_CT], metaclass=_PyCArrayType):
     # Can't inherit from Sized because the metaclass conflict between
     # Sized and _CData prevents using _CDataMeta.
     def __len__(self) -> int: ...
-    if sys.version_info >= (3, 9):
-        def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
+    def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
 
 def addressof(obj: _CData | _CDataType, /) -> int: ...
 def alignment(obj_or_type: _CData | _CDataType | type[_CData | _CDataType], /) -> int: ...

stdlib/_ctypes.pyi

@@ -292,11 +292,8 @@ def erasechar() -> bytes: ...
 def filter() -> None: ...
 def flash() -> None: ...
 def flushinp() -> None: ...
-
-if sys.version_info >= (3, 9):
-    def get_escdelay() -> int: ...
-    def get_tabsize() -> int: ...
-
+def get_escdelay() -> int: ...
+def get_tabsize() -> int: ...
 def getmouse() -> tuple[int, int, int, int, int]: ...
 def getsyx() -> tuple[int, int]: ...
 def getwin(file: SupportsRead[bytes], /) -> window: ...
@@ -341,11 +338,8 @@ def resetty() -> None: ...
 def resize_term(nlines: int, ncols: int, /) -> None: ...
 def resizeterm(nlines: int, ncols: int, /) -> None: ...
 def savetty() -> None: ...
-
-if sys.version_info >= (3, 9):
-    def set_escdelay(ms: int, /) -> None: ...
-    def set_tabsize(size: int, /) -> None: ...
-
+def set_escdelay(ms: int, /) -> None: ...
+def set_tabsize(size: int, /) -> None: ...
 def setsyx(y: int, x: int, /) -> None: ...
 def setupterm(term: str | None = None, fd: int = -1) -> None: ...
 def start_color() -> None: ...

stdlib/_curses.pyi

@@ -37,53 +37,42 @@ class HASH:
 if sys.version_info >= (3, 10):
     class UnsupportedDigestmodError(ValueError): ...
 
-if sys.version_info >= (3, 9):
-    class HASHXOF(HASH):
-        def digest(self, length: int) -> bytes: ...  # type: ignore[override]
-        def hexdigest(self, length: int) -> str: ...  # type: ignore[override]
+class HASHXOF(HASH):
+    def digest(self, length: int) -> bytes: ...  # type: ignore[override]
+    def hexdigest(self, length: int) -> str: ...  # type: ignore[override]
 
-    @final
-    class HMAC:
-        @property
-        def digest_size(self) -> int: ...
-        @property
-        def block_size(self) -> int: ...
-        @property
-        def name(self) -> str: ...
-        def copy(self) -> Self: ...
-        def digest(self) -> bytes: ...
-        def hexdigest(self) -> str: ...
-        def update(self, msg: ReadableBuffer) -> None: ...
-
-    @overload
-    def compare_digest(a: ReadableBuffer, b: ReadableBuffer, /) -> bool: ...
-    @overload
-    def compare_digest(a: AnyStr, b: AnyStr, /) -> bool: ...
-    def get_fips_mode() -> int: ...
-    def hmac_new(key: bytes | bytearray, msg: ReadableBuffer = b"", digestmod: _DigestMod = None) -> HMAC: ...
-    def new(name: str, string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_md5(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha1(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha224(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha384(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha512(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha3_224(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha3_256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha3_384(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_sha3_512(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
-    def openssl_shake_128(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
-    def openssl_shake_256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
-
-else:
-    def new(name: str, string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_md5(string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_sha1(string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_sha224(string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_sha256(string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_sha384(string: ReadableBuffer = b"") -> HASH: ...
-    def openssl_sha512(string: ReadableBuffer = b"") -> HASH: ...
+@final
+class HMAC:
+    @property
+    def digest_size(self) -> int: ...
+    @property
+    def block_size(self) -> int: ...
+    @property
+    def name(self) -> str: ...
+    def copy(self) -> Self: ...
+    def digest(self) -> bytes: ...
+    def hexdigest(self) -> str: ...
+    def update(self, msg: ReadableBuffer) -> None: ...
 
+@overload
+def compare_digest(a: ReadableBuffer, b: ReadableBuffer, /) -> bool: ...
+@overload
+def compare_digest(a: AnyStr, b: AnyStr, /) -> bool: ...
+def get_fips_mode() -> int: ...
+def hmac_new(key: bytes | bytearray, msg: ReadableBuffer = b"", digestmod: _DigestMod = None) -> HMAC: ...
+def new(name: str, string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_md5(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha1(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha224(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha384(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha512(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha3_224(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha3_256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha3_384(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_sha3_512(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASH: ...
+def openssl_shake_128(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
+def openssl_shake_256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
 def hmac_digest(key: bytes | bytearray, msg: ReadableBuffer, digest: str) -> bytes: ...
 def pbkdf2_hmac(
     hash_name: str, password: ReadableBuffer, salt: ReadableBuffer, iterations: int, dklen: int | None = None

stdlib/_hashlib.pyi

@@ -1,9 +1,6 @@
-import sys
+from types import GenericAlias
 from typing import Any, Generic, TypeVar
 
-if sys.version_info >= (3, 9):
-    from types import GenericAlias
-
 _T = TypeVar("_T")
 
 class Empty(Exception): ...
@@ -16,5 +13,4 @@ class SimpleQueue(Generic[_T]):
     def put(self, item: _T, block: bool = True, timeout: float | None = None) -> None: ...
     def put_nowait(self, item: _T) -> None: ...
     def qsize(self) -> int: ...
-    if sys.version_info >= (3, 9):
-        def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
+    def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...