fixup! Clean-up: lift code base to Python 3.10

Author: robsdedude

bin/make-unasync

@@ -302,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`

src/neo4j/api.py

@@ -385,7 +385,6 @@ def protocol_version(self) -> tuple[int, int]:
         This is returned as a 2-tuple:class:`tuple` (subclass) of
         ``(major, minor)`` integers.
         """
-        # TODO: 6.0 - remove cast when support for Python 3.7 is dropped
         return self._protocol_version
 
     @property

tests/integration/async_/test_custom_ssl_context.py

@@ -38,12 +38,14 @@ def wrap_fail(*_, **__):
     fake_ssl_context.wrap_socket.side_effect = wrap_fail
     fake_ssl_context.wrap_bio.side_effect = wrap_fail
 
-    async with neo4j.AsyncGraphDatabase.driver(
-        uri, auth=auth, ssl_context=fake_ssl_context
-    ) as driver:
-        async with driver.session() as session:
-            with pytest.raises(NoNeedToGoFurtherError):
-                await session.run("RETURN 1")
+    async with (
+        neo4j.AsyncGraphDatabase.driver(
+            uri, auth=auth, ssl_context=fake_ssl_context
+        ) as driver,
+        driver.session() as session,
+    ):
+        with pytest.raises(NoNeedToGoFurtherError):
+            await session.run("RETURN 1")
 
     assert (
         fake_ssl_context.wrap_socket.call_count

tests/integration/sync/test_custom_ssl_context.py

@@ -764,11 +764,11 @@ async def test_warn_notification_severity_driver_config(
 ) -> None:
     if inspect.isclass(expected) and issubclass(expected, Exception):
         assert min_sev is not ...  # makes no sense to test
-        with pytest.raises(expected):
-            with pytest.warns(PreviewWarning, match="notification warnings"):
-                AsyncGraphDatabase.driver(
-                    uri, warn_notification_severity=min_sev
-                )
+        with (
+            pytest.raises(expected),
+            pytest.warns(PreviewWarning, match="notification warnings"),
+        ):
+            AsyncGraphDatabase.driver(uri, warn_notification_severity=min_sev)
         return
     if min_sev is ...:
         driver = AsyncGraphDatabase.driver(uri)

tests/unit/async_/test_driver.py

@@ -135,11 +135,13 @@ async def test_opens_connection_on_tx_begin(async_fake_pool):
 async def test_keeps_connection_on_tx_run(
     async_fake_pool, test_run_args, repetitions
 ):
-    async with AsyncSession(async_fake_pool, SessionConfig()) as session:
-        async with await session.begin_transaction() as tx:
-            for _ in range(repetitions):
-                await tx.run(*test_run_args)
-                assert session._connection is not None
+    async with (
+        AsyncSession(async_fake_pool, SessionConfig()) as session,
+        await session.begin_transaction() as tx,
+    ):
+        for _ in range(repetitions):
+            await tx.run(*test_run_args)
+            assert session._connection is not None
 
 
 @pytest.mark.parametrize(
@@ -150,12 +152,14 @@ async def test_keeps_connection_on_tx_run(
 async def test_keeps_connection_on_tx_consume(
     async_fake_pool, test_run_args, repetitions
 ):
-    async with AsyncSession(async_fake_pool, SessionConfig()) as session:
-        async with await session.begin_transaction() as tx:
-            for _ in range(repetitions):
-                result = await tx.run(*test_run_args)
-                await result.consume()
-                assert session._connection is not None
+    async with (
+        AsyncSession(async_fake_pool, SessionConfig()) as session,
+        await session.begin_transaction() as tx,
+    ):
+        for _ in range(repetitions):
+            result = await tx.run(*test_run_args)
+            await result.consume()
+            assert session._connection is not None
 
 
 @pytest.mark.parametrize(