Skip to content

Commit e3c81b6

Browse files
authored
Lift server agent string restrictions (#1208)
1 parent d3fb09d commit e3c81b6

File tree

10 files changed

+2
-58
lines changed

10 files changed

+2
-58
lines changed

src/neo4j/_async/io/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"AsyncBoltPool",
2929
"AsyncNeo4jPool",
3030
"ConnectionErrorHandler",
31-
"check_supported_server_product",
3231
]
3332

3433

@@ -39,10 +38,7 @@
3938
_bolt5,
4039
)
4140
from ._bolt import AsyncBolt
42-
from ._common import (
43-
check_supported_server_product,
44-
ConnectionErrorHandler,
45-
)
41+
from ._common import ConnectionErrorHandler
4642
from ._pool import (
4743
AcquisitionAuth,
4844
AcquisitionDatabase,

src/neo4j/_async/io/_bolt3.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
tx_timeout_as_ms,
4040
)
4141
from ._common import (
42-
check_supported_server_product,
4342
CommitResponse,
4443
InitResponse,
4544
ResetResponse,
@@ -237,7 +236,6 @@ async def hello(self, dehydration_hooks=None, hydration_hooks=None):
237236
)
238237
await self.send_all()
239238
await self.fetch_all()
240-
check_supported_server_product(self.server_info.agent)
241239

242240
def logon(self, dehydration_hooks=None, hydration_hooks=None):
243241
"""Append a LOGON message to the outgoing queue."""

src/neo4j/_async/io/_bolt4.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
ServerStateManager,
4545
)
4646
from ._common import (
47-
check_supported_server_product,
4847
CommitResponse,
4948
InitResponse,
5049
ResetResponse,
@@ -157,7 +156,6 @@ async def hello(self, dehydration_hooks=None, hydration_hooks=None):
157156
)
158157
await self.send_all()
159158
await self.fetch_all()
160-
check_supported_server_product(self.server_info.agent)
161159

162160
def logon(self, dehydration_hooks=None, hydration_hooks=None):
163161
"""Append a LOGON message to the outgoing queue."""
@@ -658,7 +656,6 @@ def on_success(metadata):
658656
)
659657
await self.send_all()
660658
await self.fetch_all()
661-
check_supported_server_product(self.server_info.agent)
662659

663660

664661
class AsyncBolt4x4(AsyncBolt4x3):

src/neo4j/_async/io/_bolt5.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
ServerStateManager,
4646
)
4747
from ._common import (
48-
check_supported_server_product,
4948
CommitResponse,
5049
InitResponse,
5150
LogonResponse,
@@ -177,7 +176,6 @@ def on_success(metadata):
177176
)
178177
await self.send_all()
179178
await self.fetch_all()
180-
check_supported_server_product(self.server_info.agent)
181179

182180
def logon(self, dehydration_hooks=None, hydration_hooks=None):
183181
"""Append a LOGON message to the outgoing queue."""
@@ -652,7 +650,6 @@ def on_success(metadata):
652650
)
653651
await self.send_all()
654652
await self.fetch_all()
655-
check_supported_server_product(self.server_info.agent)
656653

657654
def logon(self, dehydration_hooks=None, hydration_hooks=None):
658655
dehydration_hooks, hydration_hooks = self._default_hydration_hooks(
@@ -736,7 +733,6 @@ def on_success(metadata):
736733
self.logon(dehydration_hooks, hydration_hooks)
737734
await self.send_all()
738735
await self.fetch_all()
739-
check_supported_server_product(self.server_info.agent)
740736

741737
def run(
742738
self,

src/neo4j/_async/io/_common.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
Neo4jError,
2727
ServiceUnavailable,
2828
SessionExpired,
29-
UnsupportedServerProduct,
3029
)
3130

3231

@@ -331,20 +330,6 @@ class CommitResponse(Response):
331330
pass
332331

333332

334-
def check_supported_server_product(agent):
335-
"""
336-
Check that a server product is supported by the driver.
337-
338-
This is done by inspecting the server agent string.
339-
340-
:param agent: server agent string to check for validity
341-
342-
:raises UnsupportedServerProduct: if the product is not supported
343-
"""
344-
if not agent.startswith("Neo4j/"):
345-
raise UnsupportedServerProduct(agent)
346-
347-
348333
async def receive_into_buffer(sock, buffer, n_bytes):
349334
end = buffer.used + n_bytes
350335
if end > len(buffer.data):

src/neo4j/_sync/io/__init__.py

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/neo4j/_sync/io/_bolt3.py

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/neo4j/_sync/io/_bolt4.py

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/neo4j/_sync/io/_bolt5.py

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/neo4j/_sync/io/_common.py

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)