*: Remaining pyupgrade 3.8 fixes

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index 60dd3e9beff1a2379e0b0a9e126c6e73c4848285..a1b23e4a8472258e84b73cde9dfeb2dcc14b0cf7 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -49,7 +49,7 @@ from tornado.log import app_log
 from tornado.util import Configurable, TimeoutError, import_object
 
 import typing
-from typing import Union, Any, Type, Optional, Callable, TypeVar, Awaitable
+from typing import Any, Callable, TypeVar, Awaitable
 
 if typing.TYPE_CHECKING:
     from typing import Dict, List, Set, TypedDict  # noqa: F401
@@ -171,9 +171,7 @@ class IOLoop(Configurable):
     _pending_tasks: set[Future] = set()
 
     @classmethod
-    def configure(
-        cls, impl: Union[None, str, Type[Configurable]], **kwargs: Any
-    ) -> None:
+    def configure(cls, impl: None | str | type[Configurable], **kwargs: Any) -> None:
         from tornado.platform.asyncio import BaseAsyncIOLoop
 
         if isinstance(impl, str):
@@ -497,7 +495,7 @@ class IOLoop(Configurable):
 
             class FutureCell(TypedDict):
                 # noqa: F841
-                future: Optional[Future]
+                future: Future | None
                 timeout_called: bool
 
         future_cell: FutureCell = {"future": None, "timeout_called": False}
@@ -686,7 +684,7 @@ class IOLoop(Configurable):
 
     def add_future(
         self,
-        future: Union[Future[_T], concurrent.futures.Future[_T]],
+        future: Future[_T] | concurrent.futures.Future[_T],
         callback: Callable[[Future[_T]], None],
     ) -> None:
         """Schedules a callback on the ``IOLoop`` when the given

diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
index 6e30137947a0f0130d7bc0b3dca8450bee440706..fd5044b98c76700962be46868aaa6bb272c9b18d 100644 (file)
--- a/tornado/test/httputil_test.py
+++ b/tornado/test/httputil_test.py
@@ -188,7 +188,7 @@ Foo
 Content-Disposition: form-data; name="files"; filename="测试.txt"
 
 Foo
---1234--""".encode("utf-8").replace(b"\n", b"\r\n")
+--1234--""".encode().replace(b"\n", b"\r\n")
         args, files = form_data_args()
         parse_multipart_form_data(b"1234", data, args, files)
         file = files["files"][0]

diff --git a/tornado/test/util.py b/tornado/test/util.py
index 2d2bda098282c3d47f24e2e27458c1db8ac89ff0..d8d2a973a24641e6021a7511cb38974be69e443f 100644 (file)
--- a/tornado/test/util.py
+++ b/tornado/test/util.py
@@ -121,6 +121,6 @@ def abstract_base_test(cls: _TestCaseType) -> _TestCaseType:
         def setUpClass(cls):
             if cls is AbstractBaseWrapper:
                 raise unittest.SkipTest(ABT_SKIP_MESSAGE)
-            super(AbstractBaseWrapper, cls).setUpClass()
+            super().setUpClass()
 
     return AbstractBaseWrapper  # type: ignore