Merge branch '4.3' into testkit-dns-message

Author: robsdedude

docs/source/index.rst

@@ -6,8 +6,8 @@ The Official Neo4j Driver for Python.
 
 Neo4j versions supported:
 
-* Neo4j 4.1
-* Neo4j 4.0
+* Neo4j 4.3
+* Neo4j 4.2
 * Neo4j 3.5
 
 Python versions supported:
@@ -241,4 +241,4 @@ Other Information
 .. _`Example Project`: https://github.com/neo4j-examples/movies-python-bolt
 .. _`Driver Wiki`: https://github.com/neo4j/neo4j-python-driver/wiki
 .. _`Migration Guide - Upgrade Neo4j drivers`: https://neo4j.com/docs/migration-guide/4.0/upgrade-driver/
-.. _`Neo4j Aura`: https://neo4j.com/neo4j-aura/
+.. _`Neo4j Aura`: https://neo4j.com/neo4j-aura/

neo4j/io/__init__.py

@@ -88,6 +88,7 @@
 )
 from neo4j.routing import RoutingTable
 
+
 # Set up logger
 log = getLogger("neo4j")
 
@@ -250,9 +251,8 @@ def open(cls, address, *, auth=None, timeout=None, routing_context=None, **pool_
 
         try:
             connection.hello()
-        except Exception as error:
-            log.debug("[#%04X]  C: <CLOSE> %s", s.getsockname()[1], str(error))
-            _close_socket(s)
+        except Exception:
+            connection.close()
             raise
 
         return connection

neo4j/time/__init__.py

@@ -389,6 +389,12 @@ def __repr__(self):
     def __str__(self):
         return self.iso_format()
 
+    def __copy__(self):
+        return self.__new(self.ticks, self.hour, self.minute, self.second, self.tzinfo)
+
+    def __deepcopy__(self, memodict={}):
+        return self.__copy__()
+
     @classmethod
     def from_iso_format(cls, s):
         m = DURATION_ISO_PATTERN.match(s)
@@ -845,6 +851,12 @@ def __sub__(self, other):
         except TypeError:
             return NotImplemented
 
+    def __copy__(self):
+        return self.__new(self.__ordinal, self.__year, self.__month, self.__day)
+
+    def __deepcopy__(self, *args, **kwargs):
+        return self.__copy__()
+
     # INSTANCE METHODS #
 
     def replace(self, **kwargs):
@@ -1133,6 +1145,12 @@ def __add__(self, other):
     def __sub__(self, other):
         return NotImplemented
 
+    def __copy__(self):
+        return self.__new(self.__ticks, self.__hour, self.__minute, self.__second, self.__tzinfo)
+
+    def __deepcopy__(self, *args, **kwargs):
+        return self.__copy__()
+
     # INSTANCE METHODS #
 
     def replace(self, **kwargs):
@@ -1474,6 +1492,12 @@ def __sub__(self, other):
             return self.__add__(-other)
         return NotImplemented
 
+    def __copy__(self):
+        return self.combine(self.__date, self.__time)
+
+    def __deepcopy__(self, *args, **kwargs):
+        return self.__copy__()
+
     # INSTANCE METHODS #
 
     def date(self):

neo4j/work/simple.py

@@ -26,11 +26,11 @@
     sleep,
 )
 
-from neo4j.conf import SessionConfig
 from neo4j.api import (
     READ_ACCESS,
     WRITE_ACCESS,
 )
+from neo4j.conf import SessionConfig
 from neo4j.data import DataHydrator
 from neo4j.exceptions import (
     ClientError,
@@ -337,7 +337,7 @@ def _run_transaction(self, access_mode, transaction_function, *args, **kwargs):
                 try:
                     result = transaction_function(tx, *args, **kwargs)
                 except Exception:
-                    tx.rollback()
+                    tx.close()
                     raise
                 else:
                     tx.commit()

neo4j/work/transaction.py

@@ -139,8 +139,8 @@ def commit(self):
         if self._closed:
             raise TransactionError("Transaction closed")
         metadata = {}
-        self._consume_results()  # DISCARD pending records then do a commit.
         try:
+            self._consume_results()  # DISCARD pending records then do a commit.
             self._connection.commit(on_success=metadata.update)
             self._connection.send_all()
             self._connection.fetch_all()
@@ -159,18 +159,19 @@ def rollback(self):
         if self._closed:
             raise TransactionError("Transaction closed")
         metadata = {}
-        if not self._connection._is_reset:
-            self._consume_results()  # DISCARD pending records then do a rollback.
-            self._connection.rollback(on_success=metadata.update)
-            self._connection.send_all()
-            self._connection.fetch_all()
-        self._closed = True
-        self._on_closed()
+        try:
+            if not self._connection._is_reset:
+                # DISCARD pending records then do a rollback.
+                self._consume_results()
+                self._connection.rollback(on_success=metadata.update)
+                self._connection.send_all()
+                self._connection.fetch_all()
+        finally:
+            self._closed = True
+            self._on_closed()
 
     def close(self):
         """Close this transaction, triggering a ROLLBACK if not closed.
-
-        :raise TransactionError: if the transaction could not perform a ROLLBACK.
         """
         if self._closed:
             return

tests/unit/time/test_date.py

@@ -24,6 +24,7 @@
 from unittest import TestCase
 
 import pytz
+import copy
 
 from neo4j.time import Duration, Date, UnixEpoch, ZeroDate
 
@@ -532,3 +533,15 @@ def test_from_iso_format(self):
         expected = Date(2018, 10, 1)
         actual = Date.from_iso_format("2018-10-01")
         self.assertEqual(expected, actual)
+
+    def test_date_copy(self):
+        d = Date(2010, 10, 1)
+        d2 = copy.copy(d)
+        self.assertIsNot(d, d2)
+        self.assertEqual(d, d2)
+
+    def test_date_deep_copy(self):
+        d = Date(2010, 10, 1)
+        d2 = copy.deepcopy(d)
+        self.assertIsNot(d, d2)
+        self.assertEqual(d, d2)

tests/unit/time/test_datetime.py

@@ -18,7 +18,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+import copy
 from unittest import TestCase
 from datetime import (
     datetime,
@@ -337,6 +337,18 @@ def test_from_iso_format_with_negative_long_tz(self):
         actual = DateTime.from_iso_format("2018-10-01T12:34:56.123456789-12:34:56.123456")
         self.assertEqual(expected, actual)
 
+    def test_datetime_copy(self):
+        d = DateTime(2010, 10, 1, 10, 0, 10)
+        d2 = copy.copy(d)
+        self.assertIsNot(d, d2)
+        self.assertEqual(d, d2)
+
+    def test_datetime_deep_copy(self):
+        d = DateTime(2010, 10, 1, 10, 0, 12)
+        d2 = copy.deepcopy(d)
+        self.assertIsNot(d, d2)
+        self.assertEqual(d, d2)
+
 
 def test_iso_format_with_time_zone_case_1():
     # python -m pytest tests/unit/time/test_datetime.py -s -v -k test_iso_format_with_time_zone_case_1