Using calendar.timegm instead of time.mktime.

dhermes · dhermes · commit 111ce666d5a4 · 2014-10-13T15:21:07.000-07:00
Note that time.mktime says:
"Convert a time tuple in local time to seconds since the Epoch."
while calendar.timegm says:
"handy function to calculate Unix timestamp from GMT."

This is why tests were failing with local timezones seeming
to matter (because they did with time.mktime).

Also changed import of datetime in datastore._helpers
to make namespace/class confusion clear. I noticed this when
looking for other uses of calendar.timegm in the codebase.
diff --git a/gcloud/datastore/_helpers.py b/gcloud/datastore/_helpers.py
@@ -3,7 +3,7 @@
 These functions are *not* part of the API.
 """
 import calendar
-from datetime import datetime, timedelta
+import datetime
 
 from google.protobuf.internal.type_checkers import Int64ValueChecker
 import pytz
@@ -43,7 +43,7 @@ def _get_protobuf_attribute_and_value(val):
     :returns: A tuple of the attribute name and proper value type.
     """
 
-    if isinstance(val, datetime):
+    if isinstance(val, datetime.datetime):
         name = 'timestamp_microseconds'
         # If the datetime is naive (no timezone), consider that it was
         # intended to be UTC and replace the tzinfo to that effect.
@@ -91,8 +91,8 @@ def _get_value_from_protobuf(pb):
     result = None
     if pb.value.HasField('timestamp_microseconds_value'):
         microseconds = pb.value.timestamp_microseconds_value
-        naive = (datetime.utcfromtimestamp(0) +
-                 timedelta(microseconds=microseconds))
+        naive = (datetime.datetime.utcfromtimestamp(0) +
+                 datetime.timedelta(microseconds=microseconds))
         result = naive.replace(tzinfo=pytz.utc)
 
     elif pb.value.HasField('key_value'):
diff --git a/gcloud/storage/connection.py b/gcloud/storage/connection.py
@@ -1,9 +1,9 @@
 """Needs module docstring."""
 
 import base64
+import calendar
 import datetime
 import json
-import time
 import urllib
 
 from Crypto.Hash import SHA256
@@ -460,7 +460,7 @@ def _get_expiration_seconds(expiration):
                 expiration = expiration.replace(tzinfo=pytz.utc)
 
             # Turn the datetime into a timestamp (seconds, not microseconds).
-            expiration = int(time.mktime(expiration.timetuple()))
+            expiration = int(calendar.timegm(expiration.timetuple()))
 
         if not isinstance(expiration, (int, long)):
             raise TypeError('Expected an integer timestamp, datetime, or '
diff --git a/gcloud/storage/test_connection.py b/gcloud/storage/test_connection.py
@@ -513,7 +513,7 @@ def test__get_expiration_seconds(self):
 
         CALL_FUT = self._getTargetClass()._get_expiration_seconds
 
-        expiration_as_seconds = 1092902400
+        expiration_as_seconds = 1092873600
         expiration_no_tz = datetime.datetime(2004, 8, 19, 0, 0, 0, 0)
 
         expiration_int = expiration_as_seconds
@@ -577,7 +577,7 @@ def test__get_expiration_seconds_w_timedelta(self):
         # occurs again with the patched datetime.
         CALL_FUT = self._getTargetClass()._get_expiration_seconds
 
-        expiration_as_seconds = 1092902400
+        expiration_as_seconds = 1092873600
         expiration_as_delta = datetime.timedelta(0)
         self.assertEqual(expiration_as_seconds,
                          CALL_FUT(expiration_as_delta))
