ValueError on invalid connection_acquisition_timeout

 - `ValueError` on invalid values (instead of `ClientError`)
 - Consistently restrict the value to be strictly positive

Author: robsdedude

CHANGELOG.md

@@ -6,6 +6,10 @@ See also https://github.com/neo4j/neo4j-python-driver/wiki for a full changelog.
 - Python 3.7, 3.8, and 3.9 support has been dropped.
 - Remove deprecated package alias `neo4j-driver`. Use `pip install neo4j` instead.
 - Remove `setup.py`. Please use a recent enough packaging/build tool that supports `pyproject.toml`
+- Changed errors raised under certain circumstances
+  - `connection_acquisition_timeout` configuration option
+    - `ValueError` on invalid values (instead of `ClientError`)
+    - Consistently restrict the value to be strictly positive
 
 
 ## Version 5.28

src/neo4j/_async/io/_pool.py

@@ -19,6 +19,7 @@
 import abc
 import asyncio
 import logging
+import math
 import typing as t
 from collections import (
     defaultdict,
@@ -669,6 +670,7 @@ async def acquire(
     ):
         # The access_mode and database is not needed for a direct connection,
         # it's just there for consistency.
+        _check_acquisition_timeout(timeout)
         log.debug(
             "[#0000]  _: <POOL> acquire direct connection, "
             "access_mode=%r, database=%r",
@@ -969,6 +971,7 @@ async def update_routing_table(
 
         :raise neo4j.exceptions.ServiceUnavailable:
         """
+        _check_acquisition_timeout(acquisition_timeout)
         async with self.refresh_lock:
             routing_table = await self.get_routing_table(database)
             if routing_table is not None:
@@ -1152,11 +1155,7 @@ async def acquire(
         if access_mode not in {WRITE_ACCESS, READ_ACCESS}:
             # TODO: 6.0 - change this to be a ValueError
             raise ClientError(f"Non valid 'access_mode'; {access_mode}")
-        if not timeout:
-            # TODO: 6.0 - change this to be a ValueError
-            raise ClientError(
-                f"'timeout' must be a float larger than 0; {timeout}"
-            )
+        _check_acquisition_timeout(timeout)
 
         from ...api import check_access_mode
 
@@ -1253,3 +1252,23 @@ async def on_write_failure(self, address, database):
             if table is not None:
                 table.writers.discard(address)
         log.debug("[#0000]  _: <POOL> table=%r", self.routing_tables)
+
+
+def _check_acquisition_timeout(timeout: object) -> None:
+    if isinstance(timeout, int):
+        if timeout <= 0:
+            raise ValueError(
+                f"Connection acquisition timeout must be > 0, got {timeout}"
+            )
+    elif isinstance(timeout, float):
+        if math.isnan(timeout):
+            raise ValueError("Connection acquisition timeout must not be NaN")
+        if timeout <= 0:
+            raise ValueError(
+                f"Connection acquisition timeout must be > 0, got {timeout}"
+            )
+    else:
+        raise TypeError(
+            "Connection acquisition timeout must be a number, "
+            f"got {type(timeout)}"
+        )