Merge "Use stdlib UTC"

Author: Zuul

swiftclient/authv1.py

@@ -37,6 +37,7 @@
 """
 
 import datetime
+from datetime import timezone
 import json
 import time
 
@@ -52,22 +53,6 @@
 from keystoneauth1.identity import base
 
 
-# stupid stdlib...
-class _UTC(datetime.tzinfo):
-    def utcoffset(self, dt):
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        return "UTC"
-
-    def dst(self, dt):
-        return datetime.timedelta(0)
-
-
-UTC = _UTC()
-del _UTC
-
-
 class ServiceCatalogV1:
     def __init__(self, auth_url, storage_url, account):
         self.auth_url = auth_url
@@ -171,11 +156,11 @@ def __init__(self, auth_url, storage_url, account, username, auth_token,
     def expires(self):
         if self._expires is None:
             return None
-        return datetime.datetime.fromtimestamp(self._expires, UTC)
+        return datetime.datetime.fromtimestamp(self._expires, timezone.utc)
 
     @property
     def issued(self):
-        return datetime.datetime.fromtimestamp(self._issued, UTC)
+        return datetime.datetime.fromtimestamp(self._issued, timezone.utc)
 
     @property
     def user_id(self):