Removal of the class ConnectionExpired

This is not used in the other drivers.

Author: martin-neotech

neo4j/__init__.py

@@ -37,7 +37,7 @@
 from neo4j.addressing import Address
 from neo4j.api import *
 from neo4j.conf import Config, PoolConfig
-from neo4j.exceptions import ConnectionExpired, ServiceUnavailable
+from neo4j.exceptions import ServiceUnavailable
 from neo4j.meta import experimental, get_user_agent, version as __version__
 
 

neo4j/exceptions.py

@@ -42,12 +42,6 @@ class IncompleteCommitError(Exception):
     """
 
 
-class ConnectionExpired(Exception):
-    """ Raised when a connection is no longer available for the
-    purpose it was originally acquired.
-    """
-
-
 class SecurityError(Exception):
     """ Raised when an action is denied due to security settings.
     """

neo4j/io/__init__.py

@@ -55,7 +55,6 @@
     ServiceUnavailable,
     AuthError,
     IncompleteCommitError,
-    ConnectionExpired,
     DatabaseUnavailableError,
     NotALeaderError,
     ForbiddenOnReadOnlyDatabaseError,
@@ -378,7 +377,7 @@ def fetch_message(self):
             log.debug("[#%04X]  S: FAILURE %r", self.local_port, summary_metadata)
             try:
                 response.on_failure(summary_metadata or {})
-            except (ConnectionExpired, ServiceUnavailable, DatabaseUnavailableError):
+            except (ServiceUnavailable, DatabaseUnavailableError):
                 if self.pool:
                     self.pool.deactivate(self.unresolved_address),
                 raise

neo4j/work/__init__.py

@@ -20,7 +20,7 @@
 
 
 from neo4j.conf import Config
-from neo4j.exceptions import ConnectionExpired, ServiceUnavailable
+from neo4j.exceptions import ServiceUnavailable
 
 
 class WorkspaceConfig(Config):
@@ -78,7 +78,7 @@ def _disconnect(self, sync):
                 try:
                     self._connection.send_all()
                     self._connection.fetch_all()
-                except (WorkspaceError, ConnectionExpired, ServiceUnavailable):
+                except (WorkspaceError, ServiceUnavailable):
                     pass
             if self._connection:
                 self._connection.in_use = False

neo4j/work/simple.py

@@ -29,7 +29,6 @@
 from neo4j.conf import DeprecatedAlias
 from neo4j.data import DataHydrator, DataDehydrator
 from neo4j.exceptions import (
-    ConnectionExpired,
     CypherError,
     IncompleteCommitError,
     ServiceUnavailable,
@@ -124,8 +123,7 @@ def close(self):
             try:
                 self._connection.send_all()
                 self._connection.fetch_all()
-            except (ConnectionExpired, CypherError, TransactionError,
-                    ServiceUnavailable, SessionExpired):
+            except (CypherError, TransactionError, ServiceUnavailable, SessionExpired):
                 pass
             finally:
                 self._disconnect()
@@ -215,35 +213,26 @@ def done(summary_metadata):
         )
 
         if not has_transaction:
-            try:
-                self._connection.send_all()
-                self._connection.fetch_message()
-            except ConnectionExpired as error:
-                raise SessionExpired(*error.args)
+            self._connection.send_all()
+            self._connection.fetch_message()
 
         return result
 
     def send(self):
         """ Send all outstanding requests.
         """
         if self._connection:
-            try:
-                self._connection.send_all()
-            except ConnectionExpired as error:
-                raise SessionExpired(*error.args)
+            self._connection.send_all()
 
     def fetch(self):
         """ Attempt to fetch at least one more record.
 
         :returns: number of records fetched
         """
         if self._connection:
-            try:
-                detail_count, _ = self._connection.fetch_message()
-            except ConnectionExpired as error:
-                raise SessionExpired(*error.args)
-            else:
-                return detail_count
+            detail_count, _ = self._connection.fetch_message()
+            return detail_count
+
         return 0
 
     def sync(self):
@@ -252,13 +241,10 @@ def sync(self):
         :returns: number of records fetched
         """
         if self._connection:
-            try:
-                self._connection.send_all()
-                detail_count, _ = self._connection.fetch_all()
-            except ConnectionExpired as error:
-                raise SessionExpired(*error.args)
-            else:
-                return detail_count
+            self._connection.send_all()
+            detail_count, _ = self._connection.fetch_all()
+            return detail_count
+
         return 0
 
     def detach(self, result, sync=True):
@@ -392,7 +378,7 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
                         tx.success = True
                 finally:
                     tx.close()
-            except (ServiceUnavailable, SessionExpired, ConnectionExpired) as error:
+            except (ServiceUnavailable, SessionExpired) as error:
                 errors.append(error)
             except TransientError as error:
                 if is_retriable_transient_error(error):