Merge pull request #3572 from takluyver/compat-cleanup

Clean up some compatibility for older Python versions

Author: bdarnell

tornado/concurrent.py

@@ -64,15 +64,8 @@ def submit(  # type: ignore[override]
             future_set_exc_info(future, sys.exc_info())
         return future
 
-    if sys.version_info >= (3, 9):
-
-        def shutdown(self, wait: bool = True, cancel_futures: bool = False) -> None:
-            pass
-
-    else:
-
-        def shutdown(self, wait: bool = True) -> None:
-            pass
+    def shutdown(self, wait: bool = True, cancel_futures: bool = False) -> None:
+        pass
 
 
 dummy_executor = DummyExecutor()

tornado/httputil.py

@@ -61,12 +61,6 @@
     from asyncio import Future  # noqa: F401
     import unittest  # noqa: F401
 
-    # This can be done unconditionally in the base class of HTTPHeaders
-    # after we drop support for Python 3.8.
-    StrMutableMapping = collections.abc.MutableMapping[str, str]
-else:
-    StrMutableMapping = collections.abc.MutableMapping
-
 # To be used with str.strip() and related methods.
 HTTP_WHITESPACE = " \t"
 
@@ -141,7 +135,7 @@ def _normalize_header(name: str) -> str:
     return "-".join([w.capitalize() for w in name.split("-")])
 
 
-class HTTPHeaders(StrMutableMapping):
+class HTTPHeaders(collections.abc.MutableMapping[str, str]):
     """A dictionary that maintains ``Http-Header-Case`` for all keys.
 
     Supports multiple values per key via a pair of new methods,