Merge pull request #115 from technige/ext-refactoring

Refactoring for extensions

Author: technige

examples/test_examples.py

@@ -21,8 +21,7 @@
 
 from unittest import skip, skipUnless
 
-from neo4j.v1 import TRUST_ON_FIRST_USE, TRUST_SIGNED_CERTIFICATES, SSL_AVAILABLE
-from neo4j.v1.session import CypherError
+from neo4j.v1 import TRUST_ON_FIRST_USE, TRUST_SIGNED_CERTIFICATES, SSL_AVAILABLE, CypherError
 from test.util import ServerTestCase
 
 # Do not change the contents of this tagged section without good reason*

neo4j/__main__.py

@@ -27,8 +27,7 @@
 from sys import stdout, stderr
 
 from .util import Watcher
-from .v1.session import GraphDatabase, basic_auth
-from neo4j.v1.session import CypherError
+from .v1 import GraphDatabase, CypherError
 
 
 def main():
@@ -60,7 +59,7 @@ def main():
             except ValueError:
                 parameters[name] = value
 
-    driver = GraphDatabase.driver(args.url, auth=basic_auth(args.user, args.password))
+    driver = GraphDatabase.driver(args.url, auth=(args.user, args.password))
     session = driver.session()
     for _ in range(args.times):
         for statement in args.statement:

neo4j/bolt/connection.py

@@ -269,10 +269,17 @@ def __init__(self, sock, **config):
         self.user_agent = user_agent
 
         # Determine auth details
-        try:
-            self.auth_dict = vars(config["auth"])
-        except (KeyError, TypeError):
+        auth = config.get("auth")
+        if not auth:
             self.auth_dict = {}
+        elif isinstance(auth, tuple) and 2 <= len(auth) <= 3:
+            from neo4j.v1 import basic_auth
+            self.auth_dict = vars(basic_auth(*auth))
+        else:
+            try:
+                self.auth_dict = vars(config["auth"])
+            except (KeyError, TypeError):
+                raise TypeError("Cannot determine auth details from %r" % auth)
 
         # Pick up the server certificate, if any
         self.der_encoded_server_certificate = config.get("der_encoded_server_certificate")
@@ -400,10 +407,12 @@ def sync(self):
         """ Send and fetch all outstanding messages.
         """
         self.send()
+        count = 0
         while self.responses:
             response = self.responses[0]
             while not response.complete:
-                self.fetch()
+                count += self.fetch()
+        return count
 
     def close(self):
         """ Close the connection.
@@ -542,7 +551,7 @@ def connect(address, ssl_context=None, **config):
     try:
         s = create_connection(address)
     except SocketError as error:
-        if error.errno == 111 or error.errno == 61 or error.errno == 10061:
+        if error.errno in (61, 111, 10061):
             raise ServiceUnavailable("Failed to establish connection to %r" % (address,))
         else:
             raise

neo4j/v1/__init__.py

@@ -18,6 +18,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .driver import *
-from .session import *
+from .api import *
+from .bolt import *
+from .security import *
 from .types import *