Revert "Restore compatibility with Python 3.8"

This reverts commit 9fcd87f.
python · AlexWaygood · May 15, 2023 · Apr 30, 2023 · May 1, 2023 · May 1, 2023
commit 010f0dd313f36d34f2a0e52659e20a44e117efc8
@@ -5,8 +5,6 @@
 # Licensed to the PSF under a contributor agreement.
 #
 
-from __future__ import annotations
-
 import abc
 import ast
 import builtins as bltns
@@ -29,15 +27,9 @@
 import traceback
 import types
 
+from collections.abc import Callable
 from types import *
-from typing import Any, Callable, Dict, NamedTuple, TYPE_CHECKING
-
-# types.NoneType only exists on Python 3.10+
-# type(None) isn't understood by type-checkers on <3.10 :(
-if TYPE_CHECKING:
-    from _typeshed import NoneType
-else:
-    NoneType = type(None)
+from typing import Any, NamedTuple
 
 # TODO:
 #
@@ -1943,7 +1935,7 @@ def dump(self):
 # maps strings to Language objects.
 # "languages" maps the name of the language ("C", "Python").
 # "extensions" maps the file extension ("c", "py").
-LangDict = Dict[str, Callable[[str], Language]]
+LangDict = dict[str, Callable[[str], Language]]
 
 languages = { 'C': CLanguage, 'Python': PythonLanguage }
 extensions: LangDict = { name: CLanguage for name in "c cc cpp cxx h hh hpp hxx".split() }

@@ -1,12 +1,10 @@
-from __future__ import annotations
-
 import re
 import sys
-from typing import Callable, List, Tuple
+from collections.abc import Callable
 
 
-TokenAndCondition = Tuple[str, str]
-TokenStack = List[TokenAndCondition]
+TokenAndCondition = tuple[str, str]
+TokenStack = list[TokenAndCondition]
 
 def negate(condition: str) -> str:
     """

@@ -1,6 +1,6 @@
 [mypy]
-# make sure clinic can still be run on Python 3.8
-python_version = 3.8
+# make sure clinic can still be run on Python 3.10
+python_version = 3.10
 pretty = True
 enable_error_code = ignore-without-code
 disallow_any_generics = True