fix for assumption of local tz by timestamp() on naive datetimes

Author: looselycoupled

btrdb/utils/timez.py

@@ -51,7 +51,7 @@ def currently_as_ns():
     Returns the current UTC time as nanoseconds since epoch
     """
     dt = datetime.utcnow()
-    return int(dt.timestamp() * 1e9)
+    return int(dt.replace(tzinfo=pytz.utc).timestamp() * 1e9)
 
 
 def ns_to_datetime(ns):

tests/btrdb/utils/test_timez.py

@@ -35,7 +35,7 @@ def test_currently_as_ns(self):
         """
         Assert currently_as_ns returns correct value
         """
-        expected = int(datetime.datetime(2018,1,1,12).timestamp() * 1e9)
+        expected = 1514808000000000000
         with freeze_time("2018-01-01 12:00:00 -0000"):
             assert currently_as_ns() == expected
 
@@ -82,10 +82,10 @@ def test_ns_to_datetime_is_correct(self):
         """
         Assert ns_to_datetime returns correct datetime
         """
-        input = 1514808000000000000
+        val = 1514808000000000000
         expected = datetime.datetime(2018,1,1,12, tzinfo=pytz.UTC)
 
-        assert ns_to_datetime(input) == expected
+        assert ns_to_datetime(val) == expected
 
 
 class TestToNanoseconds(object):