Reformat code to remove obsolete syntax (#538)

Now the source is Python 3.9 compatible

CHANGES/538.misc.rst

@@ -0,0 +1 @@
+Reformat the source to remove obsolete syntax; now it is python 3.9+ compatible.

aiojobs/__init__.py

@@ -19,14 +19,13 @@ async def create_scheduler(
     close_timeout: Optional[float] = 0.1,
     limit: Optional[int] = 100,
     pending_limit: int = 10000,
-    exception_handler: Optional[ExceptionHandler] = None
+    exception_handler: Optional[ExceptionHandler] = None,
 ) -> Scheduler:
     warnings.warn("Scheduler can now be instantiated directly.", DeprecationWarning)
 
     if exception_handler is not None and not callable(exception_handler):
         raise TypeError(
-            "A callable object or None is expected, "
-            "got {!r}".format(exception_handler)
+            f"A callable object or None is expected, got {exception_handler!r}"
         )
     return Scheduler(
         close_timeout=close_timeout,

aiojobs/_job.py

@@ -1,7 +1,8 @@
 import asyncio
 import sys
 import traceback
-from typing import TYPE_CHECKING, Coroutine, Generic, Optional, TypeVar
+from collections.abc import Coroutine
+from typing import TYPE_CHECKING, Generic, Optional, TypeVar
 
 if sys.version_info >= (3, 11):
     from asyncio import timeout as asyncio_timeout
@@ -31,7 +32,7 @@ def __init__(
 
         self._closed = False
         self._explicit = False
-        self._task: Optional["asyncio.Task[_T]"] = None
+        self._task: Optional[asyncio.Task[_T]] = None
 
         tb = traceback.extract_stack(sys._getframe(2)) if loop.get_debug() else None
         self._source_traceback = tb

aiojobs/_scheduler.py

@@ -1,15 +1,12 @@
 import asyncio
 import sys
+from collections.abc import Awaitable, Collection, Coroutine, Iterator
 from contextlib import suppress
 from types import TracebackType
 from typing import (
     Any,
-    Awaitable,
     Callable,
-    Collection,
-    Coroutine,
     Dict,
-    Iterator,
     Optional,
     Set,
     Type,
@@ -44,8 +41,7 @@ def __init__(
     ):
         if exception_handler is not None and not callable(exception_handler):
             raise TypeError(
-                "A callable object or None is expected, "
-                "got {!r}".format(exception_handler)
+                f"A callable object or None is expected, got {exception_handler!r}"
             )
 
         self._jobs: Set[Job[object]] = set()
@@ -57,7 +53,7 @@ def __init__(
         self._failed_tasks: asyncio.Queue[Optional[asyncio.Task[object]]] = (
             asyncio.Queue()
         )
-        self._failed_task: Optional["asyncio.Task[None]"] = None
+        self._failed_task: Optional[asyncio.Task[None]] = None
         if sys.version_info < (3, 10):
             self._failed_task = asyncio.create_task(self._wait_failed())
         self._pending: asyncio.Queue[Job[object]] = asyncio.Queue(maxsize=pending_limit)

aiojobs/aiohttp.py

@@ -1,11 +1,9 @@
 import asyncio
+from collections.abc import AsyncIterator, Awaitable, Coroutine
 from functools import wraps
 from typing import (
     Any,
-    AsyncIterator,
-    Awaitable,
     Callable,
-    Coroutine,
     Optional,
     TypeVar,
     Union,

tests/conftest.py

@@ -1,13 +1,17 @@
 import asyncio
-from typing import Any, AsyncIterator, Awaitable, Callable, Dict
+from collections.abc import AsyncIterator, Awaitable
+from typing import Any, Callable, Dict
 
 import pytest
 
 from aiojobs import Scheduler
 
-PARAMS: Dict[str, Any] = dict(
-    close_timeout=1.0, limit=100, pending_limit=0, exception_handler=None
-)
+PARAMS: Dict[str, Any] = {
+    "close_timeout": 1.0,
+    "limit": 100,
+    "pending_limit": 0,
+    "exception_handler": None,
+}
 
 
 @pytest.fixture

tests/test_aiohttp.py

@@ -1,5 +1,6 @@
 import asyncio
-from typing import Awaitable, Callable
+from collections.abc import Awaitable
+from typing import Callable
 
 import pytest
 from aiohttp import ClientSession, web

tests/test_job.py

@@ -1,6 +1,7 @@
 import asyncio
+from collections.abc import Awaitable
 from contextlib import suppress
-from typing import Awaitable, Callable, NoReturn
+from typing import Callable, NoReturn
 from unittest import mock
 
 import pytest

tests/test_scheduler.py

@@ -1,6 +1,7 @@
 import asyncio
 import sys
-from typing import Awaitable, Callable, List, NoReturn
+from collections.abc import Awaitable
+from typing import Callable, List, NoReturn
 from unittest import mock
 
 import pytest
@@ -315,9 +316,9 @@ async def test_pending_queue_infinite(make_scheduler: _MakeScheduler) -> None:
     async def coro(fut: "asyncio.Future[None]") -> None:
         await fut
 
-    fut1: "asyncio.Future[None]" = asyncio.Future()
-    fut2: "asyncio.Future[None]" = asyncio.Future()
-    fut3: "asyncio.Future[None]" = asyncio.Future()
+    fut1: asyncio.Future[None] = asyncio.Future()
+    fut2: asyncio.Future[None] = asyncio.Future()
+    fut3: asyncio.Future[None] = asyncio.Future()
 
     await scheduler.spawn(coro(fut1))
     assert scheduler.pending_count == 0
@@ -336,9 +337,9 @@ async def coro(fut: "asyncio.Future[None]") -> None:
         await asyncio.sleep(0)
         await fut
 
-    fut1: "asyncio.Future[None]" = asyncio.Future()
-    fut2: "asyncio.Future[None]" = asyncio.Future()
-    fut3: "asyncio.Future[None]" = asyncio.Future()
+    fut1: asyncio.Future[None] = asyncio.Future()
+    fut2: asyncio.Future[None] = asyncio.Future()
+    fut3: asyncio.Future[None] = asyncio.Future()
 
     await scheduler.spawn(coro(fut1))
     assert scheduler.active_count == 1
@@ -365,7 +366,7 @@ async def test_scheduler_concurrency_pending_limit(
     async def coro(fut: "asyncio.Future[object]") -> None:
         await fut
 
-    futures: List["asyncio.Future[object]"] = [asyncio.Future() for _ in range(3)]
+    futures: List[asyncio.Future[object]] = [asyncio.Future() for _ in range(3)]
     jobs = []
 
     async def spawn() -> None:
@@ -402,14 +403,14 @@ async def coro(fut: "asyncio.Future[None]") -> None:
     assert scheduler.active_count == 0
     assert scheduler.pending_count == 0
 
-    fut1: "asyncio.Future[None]" = asyncio.Future()
+    fut1: asyncio.Future[None] = asyncio.Future()
     job1 = await scheduler.spawn(coro(fut1))
 
     assert scheduler.active_count == 1
     assert scheduler.pending_count == 0
     assert job1.active
 
-    fut2: "asyncio.Future[None]" = asyncio.Future()
+    fut2: asyncio.Future[None] = asyncio.Future()
     job2 = await scheduler.spawn(coro(fut2))
 
     assert scheduler.active_count == 1