cleanup some imports

This is to fix some error run tests on zhen's local machine

Author: Zhen

neo4j/bolt/connection.py

@@ -34,12 +34,11 @@
 from struct import pack as struct_pack, unpack as struct_unpack
 from threading import RLock, Condition
 
-from neo4j.v1 import ClientError
 from neo4j.addressing import SocketAddress, is_ip_address
 from neo4j.bolt.cert import KNOWN_HOSTS
 from neo4j.bolt.response import InitResponse, AckFailureResponse, ResetResponse
 from neo4j.compat.ssl import SSL_AVAILABLE, HAS_SNI, SSLError
-from neo4j.exceptions import ProtocolError, SecurityError, ServiceUnavailable
+from neo4j.exceptions import ClientError, ProtocolError, SecurityError, ServiceUnavailable
 from neo4j.meta import version
 from neo4j.packstream import Packer, Unpacker
 from neo4j.util import import_best as _import_best

neo4j/v1/__init__.py

@@ -18,9 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from neo4j.exceptions import *
-
 from .api import *
 from .direct import *
 from .exceptions import *

neo4j/v1/api.py

@@ -25,8 +25,8 @@
 from time import time, sleep
 from warnings import warn
 
-from neo4j.bolt import ProtocolError, ServiceUnavailable
-from neo4j.compat import unicode, urlparse
+from neo4j.exceptions import ProtocolError, ServiceUnavailable
+from neo4j.compat import urlparse
 from neo4j.exceptions import CypherError, TransientError
 
 from .exceptions import DriverError, SessionError, SessionExpired, TransactionError

neo4j/v1/direct.py

@@ -20,7 +20,7 @@
 
 
 from neo4j.addressing import SocketAddress, resolve
-from neo4j.bolt import DEFAULT_PORT, ConnectionPool, connect, ConnectionErrorHandler
+from neo4j.bolt.connection import DEFAULT_PORT, ConnectionPool, connect, ConnectionErrorHandler
 from neo4j.exceptions import ServiceUnavailable
 from neo4j.v1.api import Driver
 from neo4j.v1.security import SecurityPlan

test/integration/test_driver.py

@@ -19,8 +19,8 @@
 # limitations under the License.
 
 
-from neo4j.v1 import GraphDatabase, ProtocolError, ServiceUnavailable
-
+from neo4j.v1 import GraphDatabase, ServiceUnavailable
+from neo4j.exceptions import ProtocolError
 from test.integration.tools import IntegrationTestCase
 
 

test/integration/test_security.py

@@ -23,7 +23,8 @@
 from ssl import SSLSocket
 from unittest import skipUnless
 
-from neo4j.v1 import GraphDatabase, SSL_AVAILABLE, TRUST_ON_FIRST_USE, TRUST_CUSTOM_CA_SIGNED_CERTIFICATES, AuthError
+from neo4j.v1 import GraphDatabase, SSL_AVAILABLE, TRUST_ON_FIRST_USE, TRUST_CUSTOM_CA_SIGNED_CERTIFICATES
+from neo4j.exceptions import AuthError
 
 from test.integration.tools import IntegrationTestCase
 

test/integration/test_session.py

@@ -24,7 +24,8 @@
 from neo4j.v1 import \
     READ_ACCESS, WRITE_ACCESS, \
     CypherError, SessionError, TransactionError, \
-    Node, Relationship, Path, CypherSyntaxError
+    Node, Relationship, Path
+from neo4j.exceptions import CypherSyntaxError
 
 from test.integration.tools import DirectIntegrationTestCase
 

test/integration/tools.py

@@ -32,7 +32,8 @@
 
 from boltkit.controller import WindowsController, UnixController
 
-from neo4j.v1 import GraphDatabase, AuthError
+from neo4j.v1 import GraphDatabase
+from neo4j.exceptions import AuthError
 from neo4j.util import ServerVersion
 
 from test.env import NEO4J_SERVER_PACKAGE, NEO4J_USER, NEO4J_PASSWORD

test/performance/tools.py

@@ -34,7 +34,8 @@
 
 from boltkit.controller import WindowsController, UnixController
 
-from neo4j.v1 import GraphDatabase, AuthError
+from neo4j.v1 import GraphDatabase
+from neo4j.exceptions import AuthError
 from neo4j.util import ServerVersion
 
 from test.env import NEO4J_SERVER_PACKAGE, NEO4J_USER, NEO4J_PASSWORD

test/stub/test_routingdriver.py

@@ -21,7 +21,8 @@
 
 from neo4j.v1 import GraphDatabase, READ_ACCESS, WRITE_ACCESS, SessionExpired, \
     RoutingDriver, RoutingConnectionPool, LeastConnectedLoadBalancingStrategy, LOAD_BALANCING_STRATEGY_ROUND_ROBIN, \
-    RoundRobinLoadBalancingStrategy, TransientError, ClientError
+    RoundRobinLoadBalancingStrategy, TransientError
+from neo4j.exceptions import ClientError
 from neo4j.bolt import ProtocolError, ServiceUnavailable
 
 from test.stub.tools import StubTestCase, StubCluster

test/unit/test_connection.py

@@ -18,12 +18,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import print_function
-import time
 from unittest import TestCase
 from threading import Thread, Event
-from neo4j.v1 import DirectConnectionErrorHandler, ClientError, ServiceUnavailable
+from neo4j.v1 import DirectConnectionErrorHandler, ServiceUnavailable
 from neo4j.bolt import Connection, ConnectionPool
-
+from neo4j.exceptions import ClientError
 
 class FakeSocket(object):
     def __init__(self, address):
@@ -164,9 +163,8 @@ def test_max_conn_pool_size(self):
             address = ("127.0.0.1", 7687)
             pool.acquire_direct(address)
             self.assertEqual(pool.in_use_connection_count(address), 1)
-            with self.assertRaises(ClientError) as context:
+            with self.assertRaises(ClientError):
                 pool.acquire_direct(address)
-            self.assertTrue('Failed to obtain a connection from pool within 0s' in context.exception)
             self.assertEqual(pool.in_use_connection_count(address), 1)
 
     def test_multithread(self):