Updating pytz imports for GAE.

dhermes · Dec 30, 2014 · f7f05bb · f7f05bb
1 parent 72fe5ea
commit f7f05bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/application/vendor/gcloud/datastore/helpers.py b/application/vendor/gcloud/datastore/helpers.py
@@ -8,7 +8,7 @@
 import datetime
 
 from google.protobuf.internal.type_checkers import Int64ValueChecker
-import pytz
+from pytz.gae import pytz  # Originally import pytz.
 import six
 
 from gcloud.datastore.entity import Entity

diff --git a/application/vendor/gcloud/datastore/test_helpers.py b/application/vendor/gcloud/datastore/test_helpers.py
@@ -128,7 +128,7 @@ def _callFUT(self, val):
     def test_datetime_naive(self):
         import calendar
         import datetime
-        import pytz
+        from pytz.gae import pytz  # Originally import pytz.
 
         naive = datetime.datetime(2014, 9, 16, 10, 19, 32, 4375)  # No zone.
         utc = datetime.datetime(2014, 9, 16, 10, 19, 32, 4375, pytz.utc)
@@ -140,7 +140,7 @@ def test_datetime_naive(self):
     def test_datetime_w_zone(self):
         import calendar
         import datetime
-        import pytz
+        from pytz.gae import pytz  # Originally import pytz.
 
         utc = datetime.datetime(2014, 9, 16, 10, 19, 32, 4375, pytz.utc)
         name, value = self._callFUT(utc)
@@ -238,7 +238,7 @@ def _makePB(self, attr_name, value):
     def test_datetime(self):
         import calendar
         import datetime
-        import pytz
+        from pytz.gae import pytz  # Originally import pytz.
 
         utc = datetime.datetime(2014, 9, 16, 10, 19, 32, 4375, pytz.utc)
         micros = (calendar.timegm(utc.timetuple()) * 1000000) + 4375
@@ -341,7 +341,7 @@ def _makePB(self):
     def test_datetime(self):
         import calendar
         import datetime
-        import pytz
+        from pytz.gae import pytz  # Originally import pytz.
 
         pb = self._makePB()
         utc = datetime.datetime(2014, 9, 16, 10, 19, 32, 4375, pytz.utc)