Revert TIMESTAMP fields returned by the system to be naive datetime

objects to avoid a breaking change in timezone handling.

Author: gmfeinberg

CHANGELOG.rst

@@ -46,8 +46,9 @@ _______
   NoSQLHandle.table_request followed by TableResult.wait_for_completion.
 * Change PreparedStatement.set_variable method to support both name and position
   variables.
-* Enhance handling of TIMESTAMP types to consider a datetime instance with
-  and explicit timezone.
+* Enhance handling of TIMESTAMP types to better handle a datetime instance with
+  an explicit timezone. By default fields of type TIMESTAMP returned by the system
+  are represented by a  "naive" (not timezone aware) datetime object in the timezone UTC.
 
 Fixed
 _____

docs/datatypes.rst

@@ -70,5 +70,7 @@ Timestamp in Borneo
 As mentioned above *Timestamp* fields are managed internally as UTC time. If a
 timezone is supplied when setting a *Timestamp*, either as a string or as a
 Python datetime object, it will be honored. The value will be converted to UTC
-internally and will be in UTC when returned in a row. If no timezone is
-supplied, python datetime instances and time strings are treated as UTC.
+internally and will be in UTC when returned in a row. Although they are represented
+in UTC returned datetime objects will be "naive" as described by Python documentation.
+On input, if no timezone is supplied, python datetime instances and time strings are
+treated as UTC.

src/borneo/serde.py

@@ -362,9 +362,9 @@ def read_bytearray_with_int(bis):
 
     @staticmethod
     def read_datetime(bis):
-        # Deserialize a datetime value.
-        return parser.parse(BinaryProtocol.read_string(bis)).replace(
-            tzinfo=tz.UTC)
+        # Deserialize a datetime value. Timezone is UTC, object is naive, not
+        # timezone aware
+        return parser.parse(BinaryProtocol.read_string(bis))
 
     @staticmethod
     def read_decimal(bis):

test/put.py

@@ -196,7 +196,11 @@ def testPutNormal(self):
         self.row['fld_time'] = (
             self.row['fld_time'].replace(tzinfo=tz.gettz('EST')))
         self.put_request.set_value(self.row).set_ttl(self.ttl)
-        self.row['fld_time'] = self.row['fld_time'].astimezone(tz.UTC)
+        # the replace(tzinfo=None) at the end makes the object a "naive"
+        # datetime. Without that there is a datetime comparison problem in
+        # check_get_result()
+        self.row['fld_time'] = (
+            self.row['fld_time'].astimezone(tz.UTC).replace(tzinfo=None))
         result = self.handle.put(self.put_request)
         expect_expiration = self.ttl.to_expiration_time(
             int(round(time() * 1000)))

test/testutils.py

@@ -157,7 +157,7 @@ def get_row(with_sid=True):
     row['fld_bool'] = True
     row['fld_str'] = '{"name": u1, "phone": null}'
     row['fld_bin'] = bytearray(pack('>i', 4))
-    row['fld_time'] = datetime.now(tz.UTC)
+    row['fld_time'] = datetime.now()
     row['fld_num'] = Decimal(5)
     location = OrderedDict()
     location['type'] = 'point'