connection->bolt

Author: technige

neo4j/v1/__init__.py

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

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

@@ -31,8 +31,6 @@
 from socket import create_connection, SHUT_RDWR, error as SocketError
 from struct import pack as struct_pack, unpack as struct_unpack, unpack_from as struct_unpack_from
 
-import errno
-
 from .constants import DEFAULT_PORT, DEFAULT_USER_AGENT, KNOWN_HOSTS, MAGIC_PREAMBLE, \
     TRUST_DEFAULT, TRUST_ON_FIRST_USE
 from .compat import hex2
@@ -239,6 +237,13 @@ def on_failure(metadata):
     def __del__(self):
         self.close()
 
+    @property
+    def healthy(self):
+        """ Return ``True`` if this connection is healthy, ``False`` if
+        unhealthy and ``None`` if closed.
+        """
+        return None if self.closed else not self.defunct
+
     def append(self, signature, fields=(), response=None):
         """ Add a message to the outgoing queue.
 
@@ -333,6 +338,12 @@ def fetch(self):
                 handler(*fields)
         raw.close()
 
+    def fetch_all(self):
+        while self.responses:
+            response = self.responses[0]
+            while not response.complete:
+                self.fetch()
+
     def close(self):
         """ Close the connection.
         """

neo4j/v1/session.py

@@ -31,7 +31,7 @@ class which can be used to obtain `Driver` instances that are used for
 from collections import deque, namedtuple
 
 from .compat import integer, string, urlparse
-from .connection import connect, Response, RUN, PULL_ALL
+from .bolt import connect, Response, RUN, PULL_ALL
 from .constants import ENCRYPTED_DEFAULT, TRUST_DEFAULT, TRUST_SIGNED_CERTIFICATES
 from .exceptions import CypherError, ProtocolError, ResultError
 from .ssl_compat import SSL_AVAILABLE, SSLContext, PROTOCOL_SSLv23, OP_NO_SSLv2, CERT_REQUIRED

test/test_session.py

@@ -346,7 +346,7 @@ def test_automatic_reset_after_failure(self):
                 assert False, "A Cypher error should have occurred"
 
     def test_defunct(self):
-        from neo4j.v1.connection import ChunkChannel, ProtocolError
+        from neo4j.v1.bolt import ChunkChannel, ProtocolError
         with GraphDatabase.driver("bolt://localhost", auth=auth_token).session() as session:
             assert not session.connection.defunct
             with patch.object(ChunkChannel, "chunk_reader", side_effect=ProtocolError()):