qa: Set pyupgrade --py38-plus

.pre-commit-config.yaml

@@ -74,7 +74,7 @@ repos:
       - id: pyupgrade
         types_or: [cython, python]
         args:
-          - '--py37-plus'
+          - '--py38-plus'
           - '--keep-runtime-typing'
   - repo: 'https://github.com/abravalheri/validate-pyproject'
     rev: v0.13

programs/client.py

@@ -29,11 +29,7 @@
 else:
     from typing import TypeAlias
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
+from typing import Final
 
 __all__ = ["Client"]
 

programs/server.py

@@ -30,11 +30,7 @@
 else:
     from typing import TypeAlias
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
+from typing import Final
 
 __all__ = ["Server"]
 

src/mbedtls/_tlsi.py

@@ -9,12 +9,16 @@
 import os
 import sys
 from dataclasses import dataclass, field
-from typing import Callable, Mapping, Optional, Tuple, TypeVar, Union
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal, Protocol
-else:
-    from typing import Literal, Protocol
+from typing import (
+    Callable,
+    Literal,
+    Mapping,
+    Optional,
+    Protocol,
+    Tuple,
+    TypeVar,
+    Union,
+)
 
 if sys.version_info < (3, 9):
     _PathLike = os.PathLike

src/mbedtls/cipher/AES.py

@@ -9,18 +9,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union, overload
+from typing import Final, Literal, Optional, Union, overload
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import AEADCipher, Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/ARC4.py

@@ -7,18 +7,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 block_size: Final = 1

src/mbedtls/cipher/ARIA.py

@@ -11,18 +11,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/Blowfish.py

@@ -6,18 +6,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 block_size: Final = 8

src/mbedtls/cipher/CHACHA20.py

@@ -8,18 +8,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union, overload
+from typing import Final, Literal, Optional, Union, overload
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import AEADCipher, Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/Camellia.py

@@ -7,18 +7,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 block_size: Final = 16

src/mbedtls/cipher/DES.py

@@ -7,18 +7,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/DES3.py

@@ -7,18 +7,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/DES3dbl.py

@@ -7,19 +7,12 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional, Union
+from typing import Final, Literal, Optional, Union
 
 from mbedtls.exceptions import TLSError
 
 from ._cipher import Cipher, Mode
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
-
 __all__ = ["block_size", "key_size", "new"]
 
 

src/mbedtls/cipher/__init__.py

@@ -11,8 +11,7 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional
+from typing import Final, Optional, Protocol, runtime_checkable
 
 from mbedtls.cipher import (
     AES,
@@ -32,12 +31,6 @@
     get_supported_ciphers as get_supported_ciphers,
 )
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final, Protocol, runtime_checkable
-else:
-    from typing import Final, Protocol, runtime_checkable
-
-
 # Add module-level aliases to comply with PEP 272.
 MODE_ECB: Final = Mode.ECB.value
 MODE_CBC: Final = Mode.CBC.value

src/mbedtls/hashlib.py

@@ -6,8 +6,7 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional
+from typing import Optional, Protocol
 
 # pylint: disable=no-name-in-module
 from mbedtls._md import Hash as Hash
@@ -16,11 +15,6 @@
 
 # pylint: enable=no-name-in-module
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol
-else:
-    from typing import Protocol
-
 
 # Work around pyflakes' F401: imported but unused
 assert algorithms_available

src/mbedtls/hmac.py

@@ -6,8 +6,7 @@
 
 from __future__ import annotations
 
-import sys
-from typing import Optional
+from typing import Optional, Protocol
 
 # pylint: disable=no-name-in-module
 from mbedtls._md import Hmac as Hmac
@@ -16,11 +15,6 @@
 
 # pylint: enable=no-name-in-module
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol
-else:
-    from typing import Protocol
-
 
 # Work around pyflakes' F401: imported but unused
 assert algorithms_available

src/mbedtls/secrets.py

@@ -14,17 +14,10 @@
 
 import base64 as _base64
 import binascii as _binascii
-import sys
-from typing import Callable, Sequence, TypeVar, cast
+from typing import Callable, Final, Sequence, TypeVar, cast
 
 import mbedtls._random as _rnd  # pylint: disable=no-name-in-module
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
-
 __all__ = [
     "randbits",
     "choice",

src/mbedtls/tls.py

@@ -10,7 +10,7 @@
 import struct
 import sys
 from contextlib import suppress
-from typing import Any, NoReturn, Optional, Tuple, Union, cast, overload
+from typing import Any, Final, NoReturn, Optional, Tuple, Union, cast, overload
 
 from ._tls import HandshakeStep as HandshakeStep
 from ._tls import HelloVerifyRequest
@@ -36,11 +36,6 @@
 from ._tlsi import TLSConfiguration as TLSConfiguration
 from ._tlsi import TLSVersion as TLSVersion
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
 if sys.version_info < (3, 10):
     from typing_extensions import TypeAlias
 else:

tests/test_pk.py

@@ -35,11 +35,7 @@
 else:
     from typing import assert_never
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
+from typing import Literal
 
 _CipherType = Union[RSA, ECC]
 

tests/test_x509.py

@@ -4,9 +4,8 @@
 
 import datetime as dt
 import pickle
-import sys
 from pathlib import Path
-from typing import Any, Callable, Optional, Tuple, Union
+from typing import Any, Callable, Final, Optional, Tuple, Union
 
 import certifi
 import pytest
@@ -15,11 +14,6 @@
 from mbedtls.pk import ECC, RSA
 from mbedtls.x509 import CRL, CRT, CSR, BasicConstraints
 
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
 _PEM = str
 _DER = bytes
 _PKey = Union[ECC, RSA]