From f16b5de765fd6c65bb3b09f56e1233577b118b27 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Sat, 17 Jan 2026 18:44:06 +0000 Subject: [PATCH] Clean up some compatibility for older Python versions --- tornado/concurrent.py | 11 ++--------- tornado/httputil.py | 8 +------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tornado/concurrent.py b/tornado/concurrent.py index e98093f2..41958ab6 100644 --- a/tornado/concurrent.py +++ b/tornado/concurrent.py @@ -64,15 +64,8 @@ class DummyExecutor(futures.Executor): 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() diff --git a/tornado/httputil.py b/tornado/httputil.py index 74dfb87f..44f86ea3 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -61,12 +61,6 @@ if typing.TYPE_CHECKING: 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, -- 2.47.3