From: Ben Darnell Date: Thu, 19 Mar 2026 15:24:02 +0000 (-0400) Subject: *: Rewrite typing imports to use their new (3.9+) locations X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88d2ef2da56f0fe772a6e763d3ad8c47bcaead37;p=thirdparty%2Ftornado.git *: Rewrite typing imports to use their new (3.9+) locations Automated change by pyupgrade ("imports" plugin) --- diff --git a/tornado/auth.py b/tornado/auth.py index 907c260c..d041b5fc 100644 --- a/tornado/auth.py +++ b/tornado/auth.py @@ -84,7 +84,8 @@ from tornado.httputil import url_concat from tornado.util import unicode_type from tornado.web import RequestHandler -from typing import Any, cast, Iterable, Union, Optional +from typing import Any, cast, Union, Optional +from collections.abc import Iterable class AuthError(Exception): diff --git a/tornado/gen.py b/tornado/gen.py index 9b218305..2a2bb209 100644 --- a/tornado/gen.py +++ b/tornado/gen.py @@ -92,21 +92,20 @@ except ImportError: import typing from typing import ( - Mapping, Union, Any, Callable, List, Type, Tuple, - Awaitable, Dict, - Sequence, overload, ) +from collections.abc import Mapping, Awaitable, Sequence if typing.TYPE_CHECKING: - from typing import Deque, Optional, Set, Iterable # noqa: F401 + from typing import Deque, Optional, Set # noqa: F401 + from collections.abc import Iterable _T = typing.TypeVar("_T") diff --git a/tornado/http1connection.py b/tornado/http1connection.py index cacc0c7e..c41b82f9 100644 --- a/tornado/http1connection.py +++ b/tornado/http1connection.py @@ -36,7 +36,8 @@ from tornado.log import gen_log, app_log from tornado.util import GzipDecompressor -from typing import cast, Optional, Type, Awaitable, Callable, Union +from typing import cast, Optional, Type, Callable, Union +from collections.abc import Awaitable CR_OR_LF_RE = re.compile(b"\r|\n") diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 4c9cf98e..915b7deb 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -53,7 +53,8 @@ from tornado import gen, httputil from tornado.ioloop import IOLoop from tornado.util import Configurable -from typing import Type, Any, Union, Callable, Optional, Awaitable, cast +from typing import Type, Any, Union, Callable, Optional, cast +from collections.abc import Awaitable class HTTPClient: diff --git a/tornado/httpserver.py b/tornado/httpserver.py index a952fac8..d8ee9fad 100644 --- a/tornado/httpserver.py +++ b/tornado/httpserver.py @@ -37,7 +37,8 @@ from tornado.tcpserver import TCPServer from tornado.util import Configurable import typing -from typing import Union, Any, Callable, Optional, Awaitable +from typing import Union, Any, Callable, Optional +from collections.abc import Awaitable if typing.TYPE_CHECKING: from typing import Set # noqa: F401 diff --git a/tornado/httputil.py b/tornado/httputil.py index 509245f7..ce239adc 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -45,13 +45,9 @@ responses import typing from typing import ( - Iterable, - Mapping, - Iterator, - Awaitable, - Generator, AnyStr, ) +from collections.abc import Iterable, Mapping, Iterator, Awaitable, Generator if typing.TYPE_CHECKING: from typing import Deque # noqa: F401 diff --git a/tornado/ioloop.py b/tornado/ioloop.py index a1b23e4a..defaaa10 100644 --- a/tornado/ioloop.py +++ b/tornado/ioloop.py @@ -49,7 +49,8 @@ from tornado.log import app_log from tornado.util import Configurable, TimeoutError, import_object import typing -from typing import Any, Callable, TypeVar, Awaitable +from typing import Any, Callable, TypeVar +from collections.abc import Awaitable if typing.TYPE_CHECKING: from typing import Dict, List, Set, TypedDict # noqa: F401 diff --git a/tornado/iostream.py b/tornado/iostream.py index 78161b1c..a8ee7f39 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -44,12 +44,12 @@ import typing from typing import ( Union, Optional, - Awaitable, Callable, - Pattern, Any, TypeVar, ) +from collections.abc import Awaitable +from re import Pattern from types import TracebackType if typing.TYPE_CHECKING: diff --git a/tornado/locale.py b/tornado/locale.py index ed071926..eb9899da 100644 --- a/tornado/locale.py +++ b/tornado/locale.py @@ -52,7 +52,8 @@ from tornado.log import gen_log from tornado._locale_data import LOCALE_NAMES -from typing import Iterable, Any +from typing import Any +from collections.abc import Iterable _default_locale = "en_US" _translations: dict[str, Any] = {} diff --git a/tornado/locks.py b/tornado/locks.py index 2bb18eca..28cde946 100644 --- a/tornado/locks.py +++ b/tornado/locks.py @@ -19,7 +19,8 @@ import types from tornado import gen, ioloop from tornado.concurrent import Future, future_set_result_unless_cancelled -from typing import Union, Optional, Type, Any, Awaitable +from typing import Union, Optional, Type, Any +from collections.abc import Awaitable import typing if typing.TYPE_CHECKING: diff --git a/tornado/netutil.py b/tornado/netutil.py index c9a8a4cb..35f294e9 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -28,7 +28,8 @@ from tornado.concurrent import dummy_executor, run_on_executor from tornado.ioloop import IOLoop from tornado.util import Configurable, errno_from_exception -from typing import Callable, Any, Union, Awaitable, Optional +from typing import Callable, Any, Union, Optional +from collections.abc import Awaitable # Note that the naming of ssl.Purpose is confusing; the purpose # of a context is to authenticate the opposite side of the connection. diff --git a/tornado/options.py b/tornado/options.py index fe9f52f7..ee3f2214 100644 --- a/tornado/options.py +++ b/tornado/options.py @@ -112,12 +112,11 @@ from tornado.util import basestring_type, exec_in from typing import ( Any, - Iterator, - Iterable, Callable, TextIO, Optional, ) +from collections.abc import Iterator, Iterable class Error(Exception): diff --git a/tornado/platform/caresresolver.py b/tornado/platform/caresresolver.py index 3945b984..fb2658e2 100644 --- a/tornado/platform/caresresolver.py +++ b/tornado/platform/caresresolver.py @@ -9,7 +9,8 @@ from tornado.netutil import Resolver, is_valid_ip import typing if typing.TYPE_CHECKING: - from typing import Generator, Any, List, Tuple, Dict # noqa: F401 + from typing import Any, List, Tuple, Dict # noqa: F401 + from collections.abc import Generator class CaresResolver(Resolver): diff --git a/tornado/queues.py b/tornado/queues.py index 86eb27e8..ddaa8dce 100644 --- a/tornado/queues.py +++ b/tornado/queues.py @@ -35,7 +35,8 @@ from tornado import gen, ioloop from tornado.concurrent import Future, future_set_result_unless_cancelled from tornado.locks import Event -from typing import TypeVar, Generic, Awaitable +from typing import TypeVar, Generic +from collections.abc import Awaitable import typing if typing.TYPE_CHECKING: diff --git a/tornado/routing.py b/tornado/routing.py index 6c6a7166..82c034c6 100644 --- a/tornado/routing.py +++ b/tornado/routing.py @@ -188,11 +188,10 @@ from typing import ( Any, Union, Optional, - Awaitable, - Pattern, overload, - Sequence, ) +from collections.abc import Awaitable, Sequence +from re import Pattern class Router(httputil.HTTPServerConnectionDelegate): diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py index 9d50ed9e..742678e6 100644 --- a/tornado/simple_httpclient.py +++ b/tornado/simple_httpclient.py @@ -33,7 +33,8 @@ import time from io import BytesIO import urllib.parse -from typing import Any, Callable, Optional, Type, Union, Awaitable +from typing import Any, Callable, Optional, Type, Union +from collections.abc import Awaitable from types import TracebackType import typing diff --git a/tornado/tcpclient.py b/tornado/tcpclient.py index 31defeb1..132dd5e4 100644 --- a/tornado/tcpclient.py +++ b/tornado/tcpclient.py @@ -29,7 +29,8 @@ from tornado import gen from tornado.netutil import Resolver from tornado.gen import TimeoutError -from typing import Any, Union, Tuple, Callable, Iterator, Optional +from typing import Any, Union, Tuple, Callable, Optional +from collections.abc import Iterator if typing.TYPE_CHECKING: from typing import Set # noqa(F401) diff --git a/tornado/tcpserver.py b/tornado/tcpserver.py index 4d760b45..a491a848 100644 --- a/tornado/tcpserver.py +++ b/tornado/tcpserver.py @@ -34,7 +34,8 @@ from tornado import process from tornado.util import errno_from_exception import typing -from typing import Union, Any, Iterable, Optional, Awaitable +from typing import Union, Any, Optional +from collections.abc import Iterable, Awaitable if typing.TYPE_CHECKING: from typing import Callable, List # noqa: F401 diff --git a/tornado/template.py b/tornado/template.py index 1a7153ec..03f33acc 100644 --- a/tornado/template.py +++ b/tornado/template.py @@ -208,7 +208,8 @@ from tornado import escape from tornado.log import app_log from tornado.util import ObjectDict, exec_in, unicode_type -from typing import Any, Union, Callable, Iterable, Optional, TextIO +from typing import Any, Union, Callable, Optional, TextIO +from collections.abc import Iterable import typing if typing.TYPE_CHECKING: diff --git a/tornado/testing.py b/tornado/testing.py index e3ac8df5..f4c7406f 100644 --- a/tornado/testing.py +++ b/tornado/testing.py @@ -34,7 +34,8 @@ from tornado.util import raise_exc_info, basestring_type from tornado.web import Application import typing -from typing import Any, Callable, Type, Union, Optional, Coroutine +from typing import Any, Callable, Type, Union, Optional +from collections.abc import Coroutine from types import TracebackType if typing.TYPE_CHECKING: diff --git a/tornado/util.py b/tornado/util.py index 58595e6b..d6e12b89 100644 --- a/tornado/util.py +++ b/tornado/util.py @@ -22,11 +22,10 @@ import zlib from typing import ( Any, - Mapping, - Match, Callable, - Sequence, ) +from collections.abc import Mapping, Sequence +from re import Match if typing.TYPE_CHECKING: # Additional imports only used in type comments. diff --git a/tornado/web.py b/tornado/web.py index 2166b50e..aa48c1f3 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -110,15 +110,13 @@ from typing import ( Any, Union, Optional, - Awaitable, Callable, - Iterable, - Generator, Type, TypeVar, cast, overload, ) +from collections.abc import Awaitable, Iterable, Generator from types import TracebackType import typing diff --git a/tornado/websocket.py b/tornado/websocket.py index b732b73b..b7eed510 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -43,10 +43,10 @@ from typing import ( Any, Optional, Union, - Awaitable, Callable, Type, ) +from collections.abc import Awaitable from types import TracebackType if TYPE_CHECKING: