Refactoring modules

Author: technige

examples/test_examples.py

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

neo4j/__main__.py

@@ -27,7 +27,8 @@
 from sys import stdout, stderr
 
 from .util import Watcher
-from .v1.session import GraphDatabase, CypherError, basic_auth
+from .v1.session import GraphDatabase, basic_auth
+from neo4j.v1.session import CypherError
 
 
 def main():

neo4j/v1/constants.py renamed to neo4j/bolt/__init__.py

@@ -18,31 +18,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from os.path import expanduser, join
-
-from .compat.ssl import SSL_AVAILABLE
-from ..meta import version
-
-
-DEFAULT_PORT = 7687
-DEFAULT_USER_AGENT = "neo4j-python/%s" % version
-
-KNOWN_HOSTS = join(expanduser("~"), ".neo4j", "known_hosts")
-
-MAGIC_PREAMBLE = 0x6060B017
-
-ENCRYPTION_OFF = 0
-ENCRYPTION_ON = 1
-ENCRYPTION_DEFAULT = ENCRYPTION_ON if SSL_AVAILABLE else ENCRYPTION_OFF
-
-TRUST_ON_FIRST_USE = 0          # Deprecated
-TRUST_SIGNED_CERTIFICATES = 1   # Deprecated
-TRUST_ALL_CERTIFICATES = 2
-TRUST_CUSTOM_CA_SIGNED_CERTIFICATES = 3
-TRUST_SYSTEM_CA_SIGNED_CERTIFICATES = 4
-TRUST_DEFAULT = TRUST_ALL_CERTIFICATES
-
-READ_ACCESS = "READ"
-WRITE_ACCESS = "WRITE"
-ACCESS_DEFAULT = WRITE_ACCESS
+from .connection import *
+from .packstream import *

neo4j/v1/bolt.py renamed to neo4j/bolt/connection.py

@@ -27,23 +27,30 @@
 
 from __future__ import division
 
+import logging
 from base64 import b64encode
 from collections import deque, namedtuple
 from io import BytesIO
-import logging
 from os import makedirs, open as os_open, write as os_write, close as os_close, O_CREAT, O_APPEND, O_WRONLY
-from os.path import dirname, isfile
+from os.path import dirname, isfile, join as path_join, expanduser
 from select import select
 from socket import create_connection, SHUT_RDWR, error as SocketError
 from struct import pack as struct_pack, unpack as struct_unpack
 from threading import RLock
 
-from .compat.ssl import SSL_AVAILABLE, HAS_SNI, SSLError
-from .constants import DEFAULT_USER_AGENT, KNOWN_HOSTS, MAGIC_PREAMBLE, TRUST_DEFAULT, TRUST_ON_FIRST_USE
-from .exceptions import ProtocolError, Unauthorized, ServiceUnavailable
+from neo4j.compat.ssl import SSL_AVAILABLE, HAS_SNI, SSLError
+from neo4j.meta import version
 from .packstream import Packer, Unpacker
 
 
+DEFAULT_PORT = 7687
+DEFAULT_USER_AGENT = "neo4j-python/%s" % version
+
+KNOWN_HOSTS = path_join(expanduser("~"), ".neo4j", "known_hosts")
+
+MAGIC_PREAMBLE = 0x6060B017
+
+
 # Signature bytes for each message type
 INIT = b"\x01"             # 0000 0001 // INIT <user_agent> <auth>
 ACK_FAILURE = b"\x0E"      # 0000 1110 // ACK_FAILURE
@@ -544,6 +551,7 @@ def connect(address, ssl_context=None, **config):
             error.__cause__ = cause
             raise error
         else:
+            from neo4j.v1 import TRUST_DEFAULT, TRUST_ON_FIRST_USE
             # Check that the server provides a certificate
             der_encoded_server_certificate = s.getpeercert(binary_form=True)
             if der_encoded_server_certificate is None:
@@ -598,3 +606,18 @@ def connect(address, ssl_context=None, **config):
     else:
         log_error("S: [CLOSE]")
         raise ProtocolError("Unknown Bolt protocol version: %d", agreed_version)
+
+
+class ServiceUnavailable(Exception):
+    """ Raised when no database service is available.
+    """
+
+
+class ProtocolError(Exception):
+    """ Raised when an unexpected or unsupported protocol event occurs.
+    """
+
+
+class Unauthorized(Exception):
+    """ Raised when an action is not permitted.
+    """

neo4j/v1/packstream.py renamed to neo4j/bolt/packstream.py

@@ -19,12 +19,6 @@
 # limitations under the License.
 
 
-try:
-    from collections.abc import MutableSet
-except ImportError:
-    from collections import MutableSet, OrderedDict
-else:
-    from collections import OrderedDict
 import logging
 from sys import stdout
 

neo4j/v1/compat/__init__.py renamed to neo4j/compat/__init__.py

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