Stop importing deprecated typing classes (#698)

Author: Dreamsorcerer

aiohttp_admin/backends/sqlalchemy.py

@@ -3,9 +3,9 @@
 import logging
 import operator
 import sys
-from collections.abc import Sequence
+from collections.abc import Callable, Coroutine, Iterator, Sequence
 from types import MappingProxyType
-from typing import Any, Callable, Coroutine, Iterator, Literal, Optional, TypeVar, Union
+from typing import Any, Literal, Optional, TypeVar, Union
 
 import sqlalchemy as sa
 from aiohttp import web

aiohttp_admin/security.py

@@ -1,7 +1,7 @@
 import json
-from collections.abc import Collection
+from collections.abc import Collection, Mapping, Sequence
 from enum import Enum
-from typing import Mapping, Optional, Sequence, Union
+from typing import Optional, Union
 
 from aiohttp import web
 from aiohttp_security import AbstractAuthorizationPolicy, SessionIdentityPolicy

tests/conftest.py

@@ -1,4 +1,5 @@
-from typing import Awaitable, Callable, Optional, Type
+from collections.abc import Awaitable, Callable
+from typing import Optional
 from unittest.mock import AsyncMock, create_autospec
 
 import pytest
@@ -15,7 +16,7 @@
 
 
 @pytest.fixture
-def base() -> Type[DeclarativeBase]:
+def base() -> type[DeclarativeBase]:
     class Base(DeclarativeBase):
         """Base model."""
 

tests/test_backends_sqlalchemy.py

@@ -1,6 +1,7 @@
 import json
+from collections.abc import Awaitable, Callable
 from datetime import date, datetime
-from typing import Awaitable, Callable, Type, Union
+from typing import Union
 
 import pytest
 import sqlalchemy as sa
@@ -16,7 +17,7 @@
 _Login = Callable[[TestClient], Awaitable[dict[str, str]]]
 
 
-def test_pk(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+def test_pk(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class TestModel(base):  # type: ignore[misc,valid-type]
         __tablename__ = "dummy"
         id: Mapped[int] = mapped_column(primary_key=True)
@@ -59,7 +60,7 @@ def test_table(mock_engine: AsyncEngine) -> None:
     }
 
 
-def test_fk(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+def test_fk(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class TestModel(base):  # type: ignore[misc,valid-type]
         __tablename__ = "dummy"
         id: Mapped[int] = mapped_column(primary_key=True)
@@ -78,7 +79,7 @@ class TestChildModel(base):  # type: ignore[misc,valid-type]
         "validators": [("required",)]}}
 
 
-def test_relationship(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+def test_relationship(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class TestMany(base):  # type: ignore[misc,valid-type]
         __tablename__ = "many"
         id: Mapped[int] = mapped_column(primary_key=True)
@@ -98,7 +99,7 @@ class TestOne(base):  # type: ignore[misc,valid-type]
     assert "ones" not in r.inputs
 
 
-def test_check_constraints(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+def test_check_constraints(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class TestCC(base):  # type: ignore[misc,valid-type]
         __tablename__ = "test"
         pk: Mapped[int] = mapped_column(primary_key=True)
@@ -139,7 +140,7 @@ class TestCC(base):  # type: ignore[misc,valid-type]
     assert f["regex"]["validators"] == [("required",), ("regex", "abc.*")]
 
 
-async def test_nonid_pk(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+async def test_nonid_pk(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class TestModel(base):  # type: ignore[misc,valid-type]
         __tablename__ = "test"
         num: Mapped[int] = mapped_column(primary_key=True)
@@ -160,7 +161,7 @@ class TestModel(base):  # type: ignore[misc,valid-type]
     }
 
 
-async def test_id_nonpk(base: Type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
+async def test_id_nonpk(base: type[DeclarativeBase], mock_engine: AsyncEngine) -> None:
     class NotPK(base):  # type: ignore[misc,valid-type]
         __tablename__ = "notpk"
         name: Mapped[str] = mapped_column(primary_key=True)

tests/test_security.py

@@ -1,5 +1,6 @@
 import json
-from typing import Awaitable, Callable, Optional
+from collections.abc import Awaitable, Callable
+from typing import Optional
 from unittest import mock
 
 from aiohttp.test_utils import TestClient

tests/test_views.py

@@ -1,6 +1,6 @@
 import json
 import re
-from typing import Awaitable, Callable
+from collections.abc import Awaitable, Callable
 
 import sqlalchemy as sa
 from aiohttp.test_utils import TestClient