diff --git a/src/neo4j/_async/io/__init__.py b/src/neo4j/_async/io/__init__.py index fddadd1d1..7c950834e 100644 --- a/src/neo4j/_async/io/__init__.py +++ b/src/neo4j/_async/io/__init__.py @@ -28,7 +28,6 @@ "AsyncBoltPool", "AsyncNeo4jPool", "ConnectionErrorHandler", - "check_supported_server_product", ] @@ -39,10 +38,7 @@ _bolt5, ) from ._bolt import AsyncBolt -from ._common import ( - check_supported_server_product, - ConnectionErrorHandler, -) +from ._common import ConnectionErrorHandler from ._pool import ( AcquisitionAuth, AcquisitionDatabase, diff --git a/src/neo4j/_async/io/_bolt3.py b/src/neo4j/_async/io/_bolt3.py index acb8fcfbc..773f6e712 100644 --- a/src/neo4j/_async/io/_bolt3.py +++ b/src/neo4j/_async/io/_bolt3.py @@ -39,7 +39,6 @@ tx_timeout_as_ms, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, ResetResponse, @@ -237,7 +236,6 @@ async def hello(self, dehydration_hooks=None, hydration_hooks=None): ) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" diff --git a/src/neo4j/_async/io/_bolt4.py b/src/neo4j/_async/io/_bolt4.py index 8e3e32b6e..beeaeef04 100644 --- a/src/neo4j/_async/io/_bolt4.py +++ b/src/neo4j/_async/io/_bolt4.py @@ -44,7 +44,6 @@ ServerStateManager, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, ResetResponse, @@ -157,7 +156,6 @@ async def hello(self, dehydration_hooks=None, hydration_hooks=None): ) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" @@ -658,7 +656,6 @@ def on_success(metadata): ) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) class AsyncBolt4x4(AsyncBolt4x3): diff --git a/src/neo4j/_async/io/_bolt5.py b/src/neo4j/_async/io/_bolt5.py index 6cad7c8fe..0648e5a0e 100644 --- a/src/neo4j/_async/io/_bolt5.py +++ b/src/neo4j/_async/io/_bolt5.py @@ -45,7 +45,6 @@ ServerStateManager, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, LogonResponse, @@ -177,7 +176,6 @@ def on_success(metadata): ) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" @@ -652,7 +650,6 @@ def on_success(metadata): ) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): dehydration_hooks, hydration_hooks = self._default_hydration_hooks( @@ -736,7 +733,6 @@ def on_success(metadata): self.logon(dehydration_hooks, hydration_hooks) await self.send_all() await self.fetch_all() - check_supported_server_product(self.server_info.agent) def run( self, diff --git a/src/neo4j/_async/io/_common.py b/src/neo4j/_async/io/_common.py index 5e412178a..bcd02c334 100644 --- a/src/neo4j/_async/io/_common.py +++ b/src/neo4j/_async/io/_common.py @@ -26,7 +26,6 @@ Neo4jError, ServiceUnavailable, SessionExpired, - UnsupportedServerProduct, ) @@ -331,20 +330,6 @@ class CommitResponse(Response): pass -def check_supported_server_product(agent): - """ - Check that a server product is supported by the driver. - - This is done by inspecting the server agent string. - - :param agent: server agent string to check for validity - - :raises UnsupportedServerProduct: if the product is not supported - """ - if not agent.startswith("Neo4j/"): - raise UnsupportedServerProduct(agent) - - async def receive_into_buffer(sock, buffer, n_bytes): end = buffer.used + n_bytes if end > len(buffer.data): diff --git a/src/neo4j/_sync/io/__init__.py b/src/neo4j/_sync/io/__init__.py index c6fc7c496..775fd504d 100644 --- a/src/neo4j/_sync/io/__init__.py +++ b/src/neo4j/_sync/io/__init__.py @@ -28,7 +28,6 @@ "BoltPool", "Neo4jPool", "ConnectionErrorHandler", - "check_supported_server_product", ] @@ -39,10 +38,7 @@ _bolt5, ) from ._bolt import Bolt -from ._common import ( - check_supported_server_product, - ConnectionErrorHandler, -) +from ._common import ConnectionErrorHandler from ._pool import ( AcquisitionAuth, AcquisitionDatabase, diff --git a/src/neo4j/_sync/io/_bolt3.py b/src/neo4j/_sync/io/_bolt3.py index cd366f7ae..a66f3ead4 100644 --- a/src/neo4j/_sync/io/_bolt3.py +++ b/src/neo4j/_sync/io/_bolt3.py @@ -39,7 +39,6 @@ tx_timeout_as_ms, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, ResetResponse, @@ -237,7 +236,6 @@ def hello(self, dehydration_hooks=None, hydration_hooks=None): ) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" diff --git a/src/neo4j/_sync/io/_bolt4.py b/src/neo4j/_sync/io/_bolt4.py index 356885804..87213df18 100644 --- a/src/neo4j/_sync/io/_bolt4.py +++ b/src/neo4j/_sync/io/_bolt4.py @@ -44,7 +44,6 @@ ServerStateManager, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, ResetResponse, @@ -157,7 +156,6 @@ def hello(self, dehydration_hooks=None, hydration_hooks=None): ) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" @@ -658,7 +656,6 @@ def on_success(metadata): ) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) class Bolt4x4(Bolt4x3): diff --git a/src/neo4j/_sync/io/_bolt5.py b/src/neo4j/_sync/io/_bolt5.py index eed74ce09..916c789e6 100644 --- a/src/neo4j/_sync/io/_bolt5.py +++ b/src/neo4j/_sync/io/_bolt5.py @@ -45,7 +45,6 @@ ServerStateManager, ) from ._common import ( - check_supported_server_product, CommitResponse, InitResponse, LogonResponse, @@ -177,7 +176,6 @@ def on_success(metadata): ) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): """Append a LOGON message to the outgoing queue.""" @@ -652,7 +650,6 @@ def on_success(metadata): ) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) def logon(self, dehydration_hooks=None, hydration_hooks=None): dehydration_hooks, hydration_hooks = self._default_hydration_hooks( @@ -736,7 +733,6 @@ def on_success(metadata): self.logon(dehydration_hooks, hydration_hooks) self.send_all() self.fetch_all() - check_supported_server_product(self.server_info.agent) def run( self, diff --git a/src/neo4j/_sync/io/_common.py b/src/neo4j/_sync/io/_common.py index b97008dd4..cdf49af02 100644 --- a/src/neo4j/_sync/io/_common.py +++ b/src/neo4j/_sync/io/_common.py @@ -26,7 +26,6 @@ Neo4jError, ServiceUnavailable, SessionExpired, - UnsupportedServerProduct, ) @@ -331,20 +330,6 @@ class CommitResponse(Response): pass -def check_supported_server_product(agent): - """ - Check that a server product is supported by the driver. - - This is done by inspecting the server agent string. - - :param agent: server agent string to check for validity - - :raises UnsupportedServerProduct: if the product is not supported - """ - if not agent.startswith("Neo4j/"): - raise UnsupportedServerProduct(agent) - - def receive_into_buffer(sock, buffer, n_bytes): end = buffer.used + n_bytes if end > len(buffer.data):