Aligned with bulk restructuring of connector

Author: technige

neo4j/__init__.py

@@ -191,8 +191,7 @@ class DirectDriver(Driver):
 
     def __new__(cls, uri, **config):
         from neobolt.addressing import SocketAddress
-        from neobolt.bolt.connection import DEFAULT_PORT, connect
-        from neobolt.direct import DirectConnectionPool
+        from neobolt.direct import DirectConnectionPool, DEFAULT_PORT, connect
         from neobolt.security import SecurityPlan
         cls._check_uri(uri)
         if SocketAddress.parse_routing_context(uri):
@@ -232,7 +231,7 @@ class RoutingDriver(Driver):
 
     def __new__(cls, uri, **config):
         from neobolt.addressing import SocketAddress
-        from neobolt.bolt.connection import DEFAULT_PORT, connect
+        from neobolt.direct import DEFAULT_PORT, connect
         from neobolt.routing import RoutingConnectionPool
         from neobolt.security import SecurityPlan
         cls._check_uri(uri)
@@ -434,7 +433,7 @@ def run(self, statement, parameters=None, **kwparameters):
 
         statement = ustr(statement)
         parameters = fix_parameters(dict(parameters or {}, **kwparameters), protocol_version,
-                                    supports_bytes=server.supports_bytes())
+                                    supports_bytes=server.supports("bytes"))
 
         hydrant = PackStreamHydrator(protocol_version)
         metadata = {
@@ -444,9 +443,9 @@ def run(self, statement, parameters=None, **kwparameters):
             "protocol_version": protocol_version,
         }
         self._last_result = result = BoltStatementResult(self, hydrant, metadata)
-        cx.run(statement, parameters, metadata)
+        cx.run(statement, parameters, on_success=metadata.update)
         cx.pull_all(
-            metadata,
+            on_success=metadata.update,
             on_records=lambda records: result._records.extend(
                 hydrant.hydrate_records(result.keys(), records)),
             on_summary=lambda: result.detach(sync=False),
@@ -570,7 +569,7 @@ def begin_transaction(self, bookmark=None):
     def _open_transaction(self, access_mode=None):
         self._transaction = Transaction(self, on_close=self._close_transaction)
         self._connect(access_mode)
-        self._connection.begin(self._bookmarks_in, {})
+        self._connection.begin(self._bookmarks_in)
 
     def commit_transaction(self):
         """ Commit the current transaction.
@@ -583,7 +582,7 @@ def commit_transaction(self):
             raise TransactionError("No transaction to commit")
         metadata = {}
         try:
-            self._connection.commit(metadata)
+            self._connection.commit(on_success=metadata.update)
         finally:
             self._disconnect(sync=True)
             self._transaction = None
@@ -602,7 +601,7 @@ def rollback_transaction(self):
             raise TransactionError("No transaction to rollback")
         metadata = {}
         try:
-            self._connection.rollback(metadata)
+            self._connection.rollback(on_success=metadata.update)
         finally:
             self._disconnect(sync=True)
             self._transaction = None

neo4j/v1/types/spatial.py

@@ -24,7 +24,7 @@
 """
 
 
-from neobolt.packstream.structure import Structure
+from neobolt.packstream import Structure
 
 
 __all__ = [

neo4j/v1/types/temporal.py

@@ -31,7 +31,7 @@
 from neotime import Duration, Date, Time, DateTime
 from pytz import FixedOffset, timezone, utc
 
-from neobolt.packstream.structure import Structure
+from neobolt.packstream import Structure
 
 
 UNIX_EPOCH_DATE = Date(1970, 1, 1)

test/integration/test_driver.py

@@ -19,8 +19,10 @@
 # limitations under the License.
 
 
-from neobolt.bolt import DEFAULT_PORT
+from neobolt.direct import DEFAULT_PORT
+
 from neo4j.v1 import GraphDatabase, Driver, ServiceUnavailable
+
 from test.integration.tools import IntegrationTestCase
 
 

test/stub/test_routingdriver.py

@@ -19,9 +19,9 @@
 # limitations under the License.
 
 
-from neobolt.bolt import ProtocolError, ServiceUnavailable
-from neobolt.config import LOAD_BALANCING_STRATEGY_ROUND_ROBIN
-from neobolt.routing import LeastConnectedLoadBalancingStrategy, RoundRobinLoadBalancingStrategy
+from neobolt.exceptions import ServiceUnavailable
+from neobolt.routing import LeastConnectedLoadBalancingStrategy, RoundRobinLoadBalancingStrategy, \
+    LOAD_BALANCING_STRATEGY_ROUND_ROBIN, RoutingProtocolError
 
 from neo4j.exceptions import ClientError
 from neo4j.v1 import GraphDatabase, READ_ACCESS, WRITE_ACCESS, SessionExpired, RoutingDriver, TransientError
@@ -47,7 +47,7 @@ def test_cannot_discover_servers_on_non_router(self):
     def test_cannot_discover_servers_on_silent_router(self):
         with StubCluster({9001: "silent_router.script"}):
             uri = "bolt+routing://127.0.0.1:9001"
-            with self.assertRaises(ProtocolError):
+            with self.assertRaises(RoutingProtocolError):
                 with GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False):
                     pass
 
@@ -217,7 +217,7 @@ def test_should_serve_read_when_missing_writer(self):
     def test_should_error_when_missing_reader(self):
         with StubCluster({9001: "router_no_readers.script"}):
             uri = "bolt+routing://127.0.0.1:9001"
-            with self.assertRaises(ProtocolError):
+            with self.assertRaises(RoutingProtocolError):
                 GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False)
 
     def test_default_load_balancing_strategy_is_least_connected(self):