Revert "Cleanup Python 3.8 leftovers (#17967)"

This reverts commit 068e22b.

Reverted commit breaks Synapse on Red Hat Enterprise Linux 9
(Alma Linux 9, Rocky Linux 9. Oracle Linux 9).
Multiple tests fail with TypeError deep inside Pydantic because
issubclass(Literal, Tuple) complains that Literal is not a class.

Reverting the commit mentioned above fixes the issue.

Signed-off-by: Oleg Girko <[email protected]>

rust/Cargo.toml

@@ -34,7 +34,7 @@ pyo3 = { version = "0.23.2", features = [
     "macros",
     "anyhow",
     "abi3",
-    "abi3-py39",
+    "abi3-py38",
 ] }
 pyo3-log = "0.12.0"
 pythonize = "0.23.0"

synapse/_scripts/synapse_port_db.py

@@ -42,12 +42,12 @@
     Set,
     Tuple,
     Type,
-    TypedDict,
     TypeVar,
     cast,
 )
 
 import yaml
+from typing_extensions import TypedDict
 
 from twisted.internet import defer, reactor as reactor_
 

synapse/api/auth/__init__.py

@@ -18,7 +18,9 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import TYPE_CHECKING, Optional, Protocol, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
+
+from typing_extensions import Protocol
 
 from twisted.web.server import Request
 

synapse/event_auth.py

@@ -32,7 +32,6 @@
     Mapping,
     MutableMapping,
     Optional,
-    Protocol,
     Set,
     Tuple,
     Union,
@@ -42,6 +41,7 @@
 from canonicaljson import encode_canonical_json
 from signedjson.key import decode_verify_key_bytes
 from signedjson.sign import SignatureVerifyException, verify_signed_json
+from typing_extensions import Protocol
 from unpaddedbase64 import decode_base64
 
 from synapse.api.constants import (

synapse/events/__init__.py

@@ -30,7 +30,6 @@
     Generic,
     Iterable,
     List,
-    Literal,
     Optional,
     Tuple,
     Type,
@@ -40,6 +39,7 @@
 )
 
 import attr
+from typing_extensions import Literal
 from unpaddedbase64 import encode_base64
 
 from synapse.api.constants import EventTypes, RelationTypes

synapse/federation/sender/__init__.py

@@ -139,13 +139,13 @@
     Hashable,
     Iterable,
     List,
-    Literal,
     Optional,
     Tuple,
 )
 
 import attr
 from prometheus_client import Counter
+from typing_extensions import Literal
 
 from twisted.internet import defer
 

synapse/federation/transport/server/__init__.py

@@ -20,7 +20,9 @@
 #
 #
 import logging
-from typing import TYPE_CHECKING, Dict, Iterable, List, Literal, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Type
+
+from typing_extensions import Literal
 
 from synapse.api.errors import FederationDeniedError, SynapseError
 from synapse.federation.transport.server._base import (

synapse/federation/transport/server/federation.py

@@ -24,7 +24,6 @@
     TYPE_CHECKING,
     Dict,
     List,
-    Literal,
     Mapping,
     Optional,
     Sequence,
@@ -33,6 +32,8 @@
     Union,
 )
 
+from typing_extensions import Literal
+
 from synapse.api.constants import Direction, EduTypes
 from synapse.api.errors import Codes, SynapseError
 from synapse.api.room_versions import RoomVersions

synapse/handlers/directory.py

@@ -21,7 +21,9 @@
 
 import logging
 import string
-from typing import TYPE_CHECKING, Iterable, List, Literal, Optional, Sequence
+from typing import TYPE_CHECKING, Iterable, List, Optional, Sequence
+
+from typing_extensions import Literal
 
 from synapse.api.constants import MAX_ALIAS_LENGTH, EventTypes
 from synapse.api.errors import (

synapse/handlers/e2e_room_keys.py

@@ -20,7 +20,9 @@
 #
 
 import logging
-from typing import TYPE_CHECKING, Dict, Literal, Optional, cast
+from typing import TYPE_CHECKING, Dict, Optional, cast
+
+from typing_extensions import Literal
 
 from synapse.api.errors import (
     Codes,

synapse/handlers/oidc.py

@@ -31,7 +31,6 @@
     List,
     Optional,
     Type,
-    TypedDict,
     TypeVar,
     Union,
 )
@@ -53,6 +52,7 @@
     MacaroonInitException,
     MacaroonInvalidSignatureException,
 )
+from typing_extensions import TypedDict
 
 from twisted.web.client import readBody
 from twisted.web.http_headers import Headers

synapse/handlers/register.py

@@ -23,9 +23,10 @@
 """Contains functions for registering clients."""
 
 import logging
-from typing import TYPE_CHECKING, Iterable, List, Optional, Tuple, TypedDict
+from typing import TYPE_CHECKING, Iterable, List, Optional, Tuple
 
 from prometheus_client import Counter
+from typing_extensions import TypedDict
 
 from synapse import types
 from synapse.api.constants import (

synapse/handlers/sso.py

@@ -33,12 +33,12 @@
     Mapping,
     NoReturn,
     Optional,
-    Protocol,
     Set,
 )
 from urllib.parse import urlencode
 
 import attr
+from typing_extensions import Protocol
 
 from twisted.web.iweb import IRequest
 from twisted.web.server import Request

synapse/http/client.py

@@ -31,7 +31,6 @@
     List,
     Mapping,
     Optional,
-    Protocol,
     Tuple,
     Union,
 )
@@ -41,6 +40,7 @@
 from canonicaljson import encode_canonical_json
 from netaddr import AddrFormatError, IPAddress, IPSet
 from prometheus_client import Counter
+from typing_extensions import Protocol
 from zope.interface import implementer
 
 from OpenSSL import SSL

synapse/http/matrixfederationclient.py

@@ -34,7 +34,6 @@
     Dict,
     Generic,
     List,
-    Literal,
     Optional,
     TextIO,
     Tuple,
@@ -49,6 +48,7 @@
 from canonicaljson import encode_canonical_json
 from prometheus_client import Counter
 from signedjson.sign import sign_json
+from typing_extensions import Literal
 
 from twisted.internet import defer
 from twisted.internet.error import DNSLookupError

synapse/http/server.py

@@ -39,14 +39,14 @@
     List,
     Optional,
     Pattern,
-    Protocol,
     Tuple,
     Union,
 )
 
 import attr
 import jinja2
 from canonicaljson import encode_canonical_json
+from typing_extensions import Protocol
 from zope.interface import implementer
 
 from twisted.internet import defer, interfaces

synapse/http/servlet.py

@@ -28,7 +28,6 @@
 from typing import (
     TYPE_CHECKING,
     List,
-    Literal,
     Mapping,
     Optional,
     Sequence,
@@ -38,6 +37,8 @@
     overload,
 )
 
+from typing_extensions import Literal
+
 from twisted.web.server import Request
 
 from synapse._pydantic_compat import (

synapse/logging/context.py

@@ -40,7 +40,6 @@
     Any,
     Awaitable,
     Callable,
-    Literal,
     Optional,
     Tuple,
     Type,
@@ -50,7 +49,7 @@
 )
 
 import attr
-from typing_extensions import ParamSpec
+from typing_extensions import Literal, ParamSpec
 
 from twisted.internet import defer, threads
 from twisted.python.threadpool import ThreadPool

synapse/logging/filter.py

@@ -19,7 +19,8 @@
 #
 #
 import logging
-from typing import Literal
+
+from typing_extensions import Literal
 
 
 class MetadataFilter(logging.Filter):

synapse/metrics/jemalloc.py

@@ -23,10 +23,11 @@
 import logging
 import os
 import re
-from typing import Iterable, Literal, Optional, overload
+from typing import Iterable, Optional, overload
 
 import attr
 from prometheus_client import REGISTRY, Metric
+from typing_extensions import Literal
 
 from synapse.metrics import GaugeMetricFamily
 from synapse.metrics._types import Collector

synapse/module_api/callbacks/spamchecker_callbacks.py

@@ -29,13 +29,15 @@
     Callable,
     Collection,
     List,
-    Literal,
     Optional,
     Tuple,
     Union,
     cast,
 )
 
+# `Literal` appears with Python 3.8.
+from typing_extensions import Literal
+
 import synapse
 from synapse.api.errors import Codes
 from synapse.logging.opentracing import trace

synapse/push/push_types.py

@@ -18,7 +18,9 @@
 # [This file includes modifications made by New Vector Limited]
 #
 #
-from typing import List, Optional, TypedDict
+from typing import List, Optional
+
+from typing_extensions import TypedDict
 
 
 class EmailReason(TypedDict, total=False):

synapse/rest/client/account.py

@@ -21,10 +21,11 @@
 #
 import logging
 import random
-from typing import TYPE_CHECKING, List, Literal, Optional, Tuple
+from typing import TYPE_CHECKING, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import attr
+from typing_extensions import Literal
 
 from twisted.web.server import Request
 

synapse/rest/client/directory.py

@@ -20,7 +20,9 @@
 #
 
 import logging
-from typing import TYPE_CHECKING, List, Literal, Optional, Tuple
+from typing import TYPE_CHECKING, List, Optional, Tuple
+
+from typing_extensions import Literal
 
 from twisted.web.server import Request
 

synapse/rest/client/login.py

@@ -30,10 +30,11 @@
     List,
     Optional,
     Tuple,
-    TypedDict,
     Union,
 )
 
+from typing_extensions import TypedDict
+
 from synapse.api.constants import ApprovalNoticeMedium
 from synapse.api.errors import (
     Codes,

synapse/state/v2.py

@@ -29,15 +29,15 @@
     Generator,
     Iterable,
     List,
-    Literal,
     Optional,
-    Protocol,
     Sequence,
     Set,
     Tuple,
     overload,
 )
 
+from typing_extensions import Literal, Protocol
+
 from synapse import event_auth
 from synapse.api.constants import EventTypes
 from synapse.api.errors import AuthError

synapse/storage/database.py

@@ -35,7 +35,6 @@
     Iterable,
     Iterator,
     List,
-    Literal,
     Mapping,
     Optional,
     Sequence,
@@ -48,7 +47,7 @@
 
 import attr
 from prometheus_client import Counter, Histogram
-from typing_extensions import Concatenate, ParamSpec
+from typing_extensions import Concatenate, Literal, ParamSpec
 
 from twisted.enterprise import adbapi
 from twisted.internet.interfaces import IReactorCore

synapse/storage/databases/main/client_ips.py

@@ -20,19 +20,10 @@
 #
 
 import logging
-from typing import (
-    TYPE_CHECKING,
-    Dict,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    TypedDict,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Dict, List, Mapping, Optional, Tuple, Union, cast
 
 import attr
+from typing_extensions import TypedDict
 
 from synapse.metrics.background_process_metrics import wrap_as_background_process
 from synapse.storage._base import SQLBaseStore