Clean-up: lift code base to Python 3.10

Author: robsdedude

benchkit/workloads.py

@@ -20,12 +20,13 @@
 import enum
 import typing as t
 from dataclasses import dataclass
-from typing import Iterator
 
 import typing_extensions as te
 
 
 if t.TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from neo4j import (
         AsyncDriver,
         AsyncManagedTransaction,

bin/make-unasync

@@ -113,6 +113,8 @@ class CustomRule(unasync.Rule):
         # it's not pretty, but it works
         # typing.Awaitable[...] -> typing.Union[...]
         self.token_replacements["Awaitable"] = "Union"
+        self.token_replacements["aiter"] = "iter"
+        self.token_replacements["anext"] = "next"
 
     def _unasync_tokens(self, tokens):
         # copy from unasync to fix handling of multiline strings
@@ -300,16 +302,15 @@ def apply_isort(paths):
 
 def apply_changes(paths):
     def files_equal(path1, path2):
-        with open(path1, "rb") as f1:
-            with open(path2, "rb") as f2:
+        with open(path1, "rb") as f1, open(path2, "rb") as f2:
+            data1 = f1.read(1024)
+            data2 = f2.read(1024)
+            while data1 or data2:
+                if data1 != data2:
+                    changed_paths[path1] = path2
+                    return False
                 data1 = f1.read(1024)
                 data2 = f2.read(1024)
-                while data1 or data2:
-                    if data1 != data2:
-                        changed_paths[path1] = path2
-                        return False
-                    data1 = f1.read(1024)
-                    data2 = f2.read(1024)
         return True
 
     changed_paths = {}

pyproject.toml

@@ -144,8 +144,7 @@ extend-exclude = [
 preview = true  # to get CPY lints
 extend-ignore = [
     "RUF002",  # allow ’ (RIGHT SINGLE QUOTATION MARK) to be used as an apostrophe (e.g. "it’s")
-    "SIM117",  # TODO: when Python 3.10+ is the minimum,
-               #       we can start to use multi-item `with` statements
+
     # pydocstyle
     "D1",   # disable check for undocumented items (way too noisy)
     "D203", # `one-blank-line-before-class`
@@ -195,6 +194,9 @@ extend-ignore = [
     # needs fixing in ruff to work with typing.Protocol
     # https://github.com/astral-sh/ruff/issues/13307
     "FURB180",
+
+    # rule is deprected and suggests not recommended practice
+    "UP038",
 ]
 select = [
     # ruff

src/neo4j/__init__.py

@@ -225,7 +225,7 @@ def __getattr__(name) -> _t.Any:
     raise AttributeError(f"module {__name__} has no attribute {name}")
 
 
-def __dir__() -> _t.List[str]:
+def __dir__() -> list[str]:
     return __all__
 
 

src/neo4j/_api.py

@@ -67,14 +67,14 @@ class NotificationMinimumSeverity(str, Enum):
 
 
 if t.TYPE_CHECKING:
-    T_NotificationMinimumSeverity = t.Union[
-        NotificationMinimumSeverity,
-        te.Literal[
+    T_NotificationMinimumSeverity = (
+        NotificationMinimumSeverity
+        | te.Literal[
             "OFF",
             "WARNING",
             "INFORMATION",
-        ],
-    ]
+        ]
+    )
     __all__.append("T_NotificationMinimumSeverity")
 
 
@@ -213,10 +213,10 @@ class NotificationDisabledClassification(str, Enum):
 
 
 if t.TYPE_CHECKING:
-    T_NotificationDisabledCategory = t.Union[
-        NotificationDisabledCategory,
-        NotificationDisabledClassification,
-        te.Literal[
+    T_NotificationDisabledCategory = (
+        NotificationDisabledCategory
+        | NotificationDisabledClassification
+        | te.Literal[
             "HINT",
             "UNRECOGNIZED",
             "UNSUPPORTED",
@@ -226,8 +226,8 @@ class NotificationDisabledClassification(str, Enum):
             "SECURITY",
             "TOPOLOGY",
             "SCHEMA",
-        ],
-    ]
+        ]
+    )
     __all__.append("T_NotificationDisabledCategory")
 
 
@@ -343,8 +343,5 @@ class TelemetryAPI(int, Enum):
 
 
 if t.TYPE_CHECKING:
-    T_RoutingControl = t.Union[
-        RoutingControl,
-        te.Literal["r", "w"],
-    ]
+    T_RoutingControl = RoutingControl | te.Literal["r", "w"]
     __all__.append("T_RoutingControl")

src/neo4j/_async/_debug/_concurrency_check.py

@@ -129,7 +129,7 @@ async def inner(*args, **kwargs):
                             tbs = deepcopy(self.__tracebacks)
                     if acquired:
                         try:
-                            item = await iter_.__anext__()
+                            item = await anext(iter_)
                         except StopAsyncIteration:
                             return
                         finally:

src/neo4j/_async/bookmark_manager.py

@@ -26,8 +26,8 @@
 )
 
 
-TBmSupplier = t.Callable[[], t.Union[Bookmarks, t.Awaitable[Bookmarks]]]
-TBmConsumer = t.Callable[[Bookmarks], t.Union[None, t.Awaitable[None]]]
+TBmSupplier = t.Callable[[], Bookmarks | t.Awaitable[Bookmarks]]
+TBmConsumer = t.Callable[[Bookmarks], None | t.Awaitable[None]]
 
 
 def _bookmarks_to_set(

src/neo4j/_async/home_db_cache.py

@@ -28,12 +28,8 @@
 if t.TYPE_CHECKING:
     import typing_extensions as te
 
-    TKey: te.TypeAlias = t.Union[
-        str,
-        t.Tuple[t.Tuple[str, t.Hashable], ...],
-        t.Tuple[None],
-    ]
-    TVal: te.TypeAlias = t.Tuple[float, str]
+    TKey: te.TypeAlias = str | tuple[tuple[str, t.Hashable], ...] | tuple[None]
+    TVal: te.TypeAlias = tuple[float, str]
 
 
 class AsyncHomeDbCache:

src/neo4j/_async/io/_bolt3.py

@@ -309,7 +309,8 @@ async def route(
         await self.send_all()
         await self.fetch_all()
         return [
-            dict(zip(metadata.get("fields", ()), values)) for values in records
+            dict(zip(metadata.get("fields", ()), values, strict=False))
+            for values in records
         ]
 
     def run(

src/neo4j/_async/io/_bolt4.py

@@ -224,7 +224,8 @@ async def route(
         await self.send_all()
         await self.fetch_all()
         return [
-            dict(zip(metadata.get("fields", ()), values)) for values in records
+            dict(zip(metadata.get("fields", ()), values, strict=False))
+            for values in records
         ]
 
     def run(