fix iterator and generatortype hints

(cherry picked from commit 71ffd57)

Author: amirreza8002

django_valkey/base.py

@@ -1,15 +1,13 @@
 import builtins
-from asyncio import iscoroutinefunction
 import contextlib
 import functools
 import logging
+from asyncio import iscoroutinefunction
+from collections.abc import AsyncGenerator, Callable, Iterator
 from typing import (
     Any,
     TypeVar,
     Generic,
-    Iterator,
-    AsyncGenerator,
-    Callable,
     TYPE_CHECKING,
 )
 
@@ -445,7 +443,7 @@ async def ttl(self, *args, **kwargs) -> int:
     async def pttl(self, *args, **kwargs) -> int:
         return await self.client.pttl(*args, **kwargs)
 
-    async def iter_keys(self, *args, **kwargs) -> AsyncGenerator[Any]:
+    async def iter_keys(self, *args, **kwargs) -> AsyncGenerator[Any, None]:
         async with contextlib.aclosing(self.client.iter_keys(*args, **kwargs)) as it:
             async for key in it:
                 yield key
@@ -495,7 +493,7 @@ async def srem(self, *args, **kwargs) -> int:
     async def sscan(self, *args, **kwargs) -> builtins.set[Any]:
         return await self.client.sscan(*args, **kwargs)
 
-    async def sscan_iter(self, *args, **kwargs) -> AsyncGenerator[Any]:
+    async def sscan_iter(self, *args, **kwargs) -> AsyncGenerator[Any, None]:
         async with contextlib.aclosing(self.client.sscan_iter(*args, **kwargs)) as it:
             async for key in it:
                 yield key

django_valkey/base_client.py

@@ -3,20 +3,18 @@
 import re
 import socket
 import time
+from collections.abc import AsyncGenerator, Iterable, Iterator
 from contextlib import suppress
 from typing import (
     Any,
     Dict,
-    Iterable,
-    Iterator,
     List,
     Set,
     Tuple,
     cast,
     TYPE_CHECKING,
     Generic,
     TypeVar,
-    AsyncGenerator,
 )
 
 from django.conf import settings
@@ -879,7 +877,7 @@ def iter_keys(
     ) -> Iterator[str]:
         """
         Same as keys, but uses cursors
-        for make memory efficient keys iteration.
+        to make memory efficient keys iteration.
         """
 
         client = self._get_client(write=False, client=client)
@@ -1841,10 +1839,10 @@ async def iter_keys(
         itersize: int | None = None,
         client: Backend | Any | None = None,
         version: int | None = None,
-    ) -> AsyncGenerator:
+    ) -> AsyncGenerator[str, None]:
         """
         Same as keys, but uses cursors
-        for make memory efficient keys iteration.
+        to make memory efficient keys iteration.
         """
         client = await self._get_client(write=False, client=client)
         pattern = self.make_pattern(search, version=version)

django_valkey/client/herd.py

@@ -1,5 +1,6 @@
 import socket
-from typing import Any, Iterable
+from collections.abc import Iterable
+from typing import Any
 
 from valkey import Valkey
 from valkey.exceptions import ConnectionError, ResponseError, TimeoutError

django_valkey/hash_ring.py

@@ -1,6 +1,7 @@
 import bisect
 import hashlib
-from typing import Dict, Iterable, Iterator, List, Tuple
+from collections.abc import Iterable, Iterator
+from typing import Dict, List, Tuple
 
 
 class HashRing:

tests/conftest.py

@@ -1,4 +1,4 @@
-from typing import Iterable
+from collections.abc import Iterable
 
 import pytest
 import pytest_asyncio

tests/test_backend.py

@@ -1,8 +1,9 @@
 import datetime
 import threading
 import time
+from collections.abc import Iterable
 from datetime import timedelta
-from typing import Iterable, List, cast
+from typing import List, cast
 from unittest.mock import patch
 
 import pytest

tests/test_cache_options.py

@@ -1,5 +1,6 @@
 import copy
-from typing import Iterable, cast
+from collections.abc import Iterable
+from typing import cast
 
 import pytest
 from django.core.cache import caches

tests/test_client.py

@@ -1,4 +1,4 @@
-from typing import Iterable
+from collections.abc import Iterable
 from unittest.mock import Mock, call, patch
 
 import pytest

tests/tests_async/test_backend.py

@@ -1,9 +1,10 @@
 import asyncio
 import contextlib
 import datetime
-from datetime import timedelta
 import threading
-from typing import Iterable, List, cast
+from collections.abc import Iterable
+from datetime import timedelta
+from typing import List, cast
 from unittest.mock import patch, AsyncMock
 
 import pytest

tests/tests_async/test_cache_options.py

@@ -1,6 +1,7 @@
 import contextlib
 import copy
-from typing import Iterable, cast
+from collections.abc import Iterable
+from typing import cast
 
 import pytest
 from pytest import LogCaptureFixture