Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions tornado/concurrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 1 addition & 7 deletions tornado/httputil.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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,
Expand Down