Remove typing_extensions usage

Author: tulir

mautrix/api.py

@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import annotations
 
-from typing import ClassVar, Mapping
+from typing import ClassVar, Literal, Mapping
 from enum import Enum
 from json.decoder import JSONDecodeError
 from time import time
@@ -14,7 +14,6 @@
 import json
 import logging
 import platform
-import sys
 
 from aiohttp import ClientSession, __version__ as aiohttp_version
 from aiohttp.client_exceptions import ClientError, ContentTypeError
@@ -25,11 +24,6 @@
 from mautrix.util.logging import TraceLogger
 from mautrix.util.opt_prometheus import Counter
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 if __optional_imports__:
     # Safe to import, but it's not actually needed, so don't force-import the whole types module.
     from mautrix.types import JSON

mautrix/client/api/modules/media_repository.py

@@ -5,8 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import annotations
 
-from typing import AsyncIterable
-import sys
+from typing import AsyncIterable, Literal
 
 from mautrix import __optional_imports__
 from mautrix.api import MediaPath, Method
@@ -15,11 +14,6 @@
 
 from ..base import BaseClientAPI
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 try:
     from mautrix.util import magic
 except ImportError:

mautrix/client/state_store/memory.py

@@ -5,8 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import annotations
 
-from typing import Any
-import sys
+from typing import Any, TypedDict
 
 from mautrix.types import (
     Member,
@@ -20,11 +19,6 @@
 
 from .abstract import StateStore
 
-if sys.version_info >= (3, 8):
-    from typing import TypedDict
-else:
-    from typing_extensions import TypedDict
-
 
 class SerializedStateStore(TypedDict):
     members: dict[RoomID, dict[UserID, Any]]

mautrix/crypto/base.py

@@ -5,11 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import annotations
 
-from typing import Any, Awaitable, Callable, Dict
+from typing import Any, Awaitable, Callable, Dict, TypedDict
 import asyncio
 import functools
 import json
-import sys
 
 import olm
 
@@ -27,11 +26,6 @@
 
 from .. import client as cli, crypto
 
-if sys.version_info >= (3, 8):
-    from typing import TypedDict
-else:
-    from typing_extensions import TypedDict
-
 
 class SignedObject(TypedDict):
     signatures: Dict[UserID, Dict[str, str]]

mautrix/util/file_store.py

@@ -5,19 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import annotations
 
-from typing import IO, Any
+from typing import IO, Any, Protocol
 from abc import ABC, abstractmethod
 from pathlib import Path
 import json
 import pickle
-import sys
 import time
 
-if sys.version_info >= (3, 8):
-    from typing import Protocol
-else:
-    from typing_extensions import Protocol
-
 
 class Filer(Protocol):
     def dump(self, obj: Any, file: IO) -> None:

requirements.txt

@@ -1,4 +1,3 @@
 aiohttp
 attrs
 yarl
-typing_extensions; python_version<"3.8"