fix: remove pytz

busunkim96 · busunkim96 · commit 7817807381e7 · 2021-08-12T20:21:49.000Z
diff --git a/google/cloud/ndb/model.py b/google/cloud/ndb/model.py
@@ -259,8 +259,6 @@ class Person(Model):
 import six
 import zlib
 
-import pytz
-
 from google.cloud.datastore import entity as ds_entity_module
 from google.cloud.datastore import helpers
 from google.cloud.datastore_v1.proto import entity_pb2
@@ -3880,11 +3878,11 @@ def _from_base_type(self, value):
         if isinstance(value, six.integer_types):
             # Projection query, value is integer nanoseconds
             seconds = value / 1e6
-            value = datetime.datetime.fromtimestamp(seconds, pytz.utc)
+            value = datetime.datetime.fromtimestamp(seconds, datetime.timezone.utc)
 
         if self._tzinfo is not None:
             if value.tzinfo is None:
-                value = value.replace(tzinfo=pytz.utc)
+                value = value.replace(tzinfo=datetime.timezone.utc)
             return value.astimezone(self._tzinfo)
 
         elif value.tzinfo is not None:
@@ -3903,7 +3901,7 @@ def _to_base_type(self, value):
             TypeError: If ``value`` is not a :class:`~key.Key`.
         """
         if self._tzinfo is not None and value.tzinfo is not None:
-            return value.astimezone(pytz.utc)
+            return value.astimezone(datetime.timezone.utc)
 
 
 class DateProperty(DateTimeProperty):
diff --git a/tests/system/test_crud.py b/tests/system/test_crud.py
@@ -18,7 +18,6 @@
 import datetime
 import os
 import pickle
-import pytz
 import random
 import threading
 import zlib
@@ -1336,10 +1335,10 @@ def test_insert_autonow_property_with_tz(dispose_of):
     """
 
     class SomeKind(ndb.Model):
-        created_at = ndb.DateTimeProperty(auto_now_add=True, tzinfo=pytz.utc)
-        updated_at = ndb.DateTimeProperty(auto_now=True, tzinfo=pytz.utc)
+        created_at = ndb.DateTimeProperty(auto_now_add=True, tzinfo=datetime.timezone.utc)
+        updated_at = ndb.DateTimeProperty(auto_now=True, tzinfo=datetime.timezone.utc)
 
-    now = datetime.datetime.now(pytz.utc)
+    now = datetime.datetime.now(datetime.timezone.utc)
     entity = SomeKind()
     key = entity.put()
     dispose_of(key._key)
@@ -1361,10 +1360,10 @@ def test_insert_datetime_property_with_tz(dispose_of):
     """
 
     class SomeKind(ndb.Model):
-        alarm1 = ndb.DateTimeProperty(tzinfo=pytz.utc)
-        alarm2 = ndb.DateTimeProperty(tzinfo=pytz.utc)
+        alarm1 = ndb.DateTimeProperty(tzinfo=datetime.timezone.utc)
+        alarm2 = ndb.DateTimeProperty(tzinfo=datetime.timezone.utc)
 
-    now = datetime.datetime.now(pytz.utc)
+    now = datetime.datetime.now(datetime.timezone.utc)
     entity = SomeKind(
         alarm1=now,
         alarm2=datetime.datetime.utcnow(),  # naive
diff --git a/tests/system/test_query.py b/tests/system/test_query.py
@@ -22,7 +22,6 @@
 import uuid
 
 import pytest
-import pytz
 
 import test_utils.system
 
@@ -247,13 +246,13 @@ def test_projection_datetime(ds_entity):
     ds_entity(
         KIND,
         entity_id,
-        foo=datetime.datetime(2010, 5, 12, 2, 42, tzinfo=pytz.UTC),
+        foo=datetime.datetime(2010, 5, 12, 2, 42, tzinfo=datetime.timezone.utc),
     )
     entity_id = test_utils.system.unique_resource_id()
     ds_entity(
         KIND,
         entity_id,
-        foo=datetime.datetime(2010, 5, 12, 2, 43, tzinfo=pytz.UTC),
+        foo=datetime.datetime(2010, 5, 12, 2, 43, tzinfo=datetime.timezone.utc),
     )
 
     class SomeKind(ndb.Model):
diff --git a/tests/unit/test_model.py b/tests/unit/test_model.py
@@ -14,7 +14,6 @@
 
 import datetime
 import pickle
-import pytz
 import six
 import types
 import zlib
@@ -2748,7 +2747,7 @@ def test__validate_invalid():
     @staticmethod
     def test__validate_with_tz():
         prop = model.DateTimeProperty(name="dt_val")
-        value = datetime.datetime.now(tz=pytz.utc)
+        value = datetime.datetime.now(tz=datetime.timezone.utc)
         with pytest.raises(exceptions.BadValueError):
             prop._validate(value)
 
@@ -2819,13 +2818,13 @@ def test__from_base_type_no_timezone():
     @staticmethod
     def test__from_base_type_timezone():
         prop = model.DateTimeProperty(name="dt_val")
-        value = datetime.datetime(2010, 5, 12, tzinfo=pytz.utc)
+        value = datetime.datetime(2010, 5, 12, tzinfo=datetime.timezone.utc)
         assert prop._from_base_type(value) == datetime.datetime(2010, 5, 12)
 
     @staticmethod
     def test__from_base_type_convert_timezone():
         prop = model.DateTimeProperty(name="dt_val", tzinfo=timezone(-4))
-        value = datetime.datetime(2010, 5, 12, tzinfo=pytz.utc)
+        value = datetime.datetime(2010, 5, 12, tzinfo=datetime.timezone.utc)
         assert prop._from_base_type(value) == datetime.datetime(
             2010, 5, 11, 20, tzinfo=timezone(-4)
         )
@@ -2855,7 +2854,7 @@ def test__to_base_type_convert_to_utc():
         prop = model.DateTimeProperty(name="dt_val", tzinfo=timezone(-4))
         value = datetime.datetime(2010, 5, 12, tzinfo=timezone(-4))
         assert prop._to_base_type(value) == datetime.datetime(
-            2010, 5, 12, 4, tzinfo=pytz.utc
+            2010, 5, 12, 4, tzinfo=datetime.timezone.utc
         )
 
 
