Remove oslo.utils dependency

Remove oslo.utils as it has additional dependencies. We still need to
rely on iso8601 which oslo.utils was using.

Change-Id: Ic7da1e7c39e0e7bfa3470c50ef1f3b6df81ac021

keystoneauth/_utils.py

@@ -14,6 +14,9 @@ import functools
 import inspect
 import logging
 
+import iso8601
+import six
+
 
 logger = logging.getLogger(__name__)
 
@@ -171,3 +174,21 @@ class positional(object):
             return func(*args, **kwargs)
 
         return inner
+
+
+def normalize_time(timestamp):
+    """Normalize time in arbitrary timezone to UTC naive object."""
+    offset = timestamp.utcoffset()
+    if offset is None:
+        return timestamp
+    return timestamp.replace(tzinfo=None) - offset
+
+
+def parse_isotime(timestr):
+    """Parse time from ISO 8601 format."""
+    try:
+        return iso8601.parse_date(timestr)
+    except iso8601.ParseError as e:
+        raise ValueError(six.text_type(e))
+    except TypeError as e:
+        raise ValueError(six.text_type(e))

keystoneauth/access.py

@@ -17,8 +17,6 @@
 import datetime
 import functools
 
-from oslo_utils import timeutils
-
 from keystoneauth import _utils as utils
 from keystoneauth.i18n import _
 from keystoneauth import service_catalog
@@ -78,19 +76,17 @@ class AccessInfo(object):
 
         return self._service_catalog
 
-    def will_expire_soon(self, stale_duration=None):
+    def will_expire_soon(self, stale_duration=STALE_TOKEN_DURATION):
         """Determines if expiration is about to occur.
 
         :returns: true if expiration is within the given duration
         :rtype: boolean
 
         """
-        stale_duration = (STALE_TOKEN_DURATION if stale_duration is None
-                          else stale_duration)
-        norm_expires = timeutils.normalize_time(self.expires)
+        norm_expires = utils.normalize_time(self.expires)
         # (gyee) should we move auth_token.will_expire_soon() to timeutils
         # instead of duplicating code here?
-        soon = (timeutils.utcnow() + datetime.timedelta(
+        soon = (datetime.datetime.utcnow() + datetime.timedelta(
                 seconds=stale_duration))
         return norm_expires < soon
 
@@ -380,7 +376,7 @@ class AccessInfoV2(AccessInfo):
 
     @missingproperty
     def expires(self):
-        return timeutils.parse_isotime(self._token.get('expires'))
+        return utils.parse_isotime(self._token.get('expires'))
 
     @missingproperty
     def issued(self):
@@ -549,11 +545,11 @@ class AccessInfoV3(AccessInfo):
 
     @missingproperty
     def expires(self):
-        return timeutils.parse_isotime(self._data['token']['expires_at'])
+        return utils.parse_isotime(self._data['token']['expires_at'])
 
     @missingproperty
     def issued(self):
-        return timeutils.parse_isotime(self._data['token']['issued_at'])
+        return utils.parse_isotime(self._data['token']['issued_at'])
 
     @missingproperty
     def user_id(self):

keystoneauth/fixture/discovery.py

@@ -12,8 +12,6 @@
 
 import datetime
 
-from oslo_utils import timeutils
-
 from keystoneauth import _utils as utils
 
 __all__ = ['DiscoveryList',
@@ -40,7 +38,7 @@ class DiscoveryBase(dict):
 
         self.id = id
         self.status = status or 'stable'
-        self.updated = updated or (timeutils.utcnow() -
+        self.updated = updated or (datetime.datetime.utcnow() -
                                    datetime.timedelta(days=_DEFAULT_DAYS_AGO))
 
     @property
@@ -73,11 +71,11 @@ class DiscoveryBase(dict):
 
     @property
     def updated(self):
-        return timeutils.parse_isotime(self.updated_str)
+        return utils.parse_isotime(self.updated_str)
 
     @updated.setter
     def updated(self, value):
-        self.updated_str = timeutils.isotime(value)
+        self.updated_str = value.isoformat()
 
     @utils.positional()
     def add_link(self, href, rel='self', type=None):

keystoneauth/fixture/v2.py

@@ -13,8 +13,7 @@
 import datetime
 import uuid
 
-from oslo_utils import timeutils
-
+from keystoneauth import _utils
 from keystoneauth.fixture import exception
 
 
@@ -54,7 +53,7 @@ class Token(dict):
         self.audit_id = audit_id or uuid.uuid4().hex
 
         if not issued:
-            issued = timeutils.utcnow() - datetime.timedelta(minutes=2)
+            issued = datetime.datetime.utcnow() - datetime.timedelta(minutes=2)
         if not expires:
             expires = issued + datetime.timedelta(hours=1)
 
@@ -108,11 +107,11 @@ class Token(dict):
 
     @property
     def expires(self):
-        return timeutils.parse_isotime(self.expires_str)
+        return _utils.parse_isotime(self.expires_str)
 
     @expires.setter
     def expires(self, value):
-        self.expires_str = timeutils.isotime(value)
+        self.expires_str = value.isoformat()
 
     @property
     def issued_str(self):
@@ -124,11 +123,11 @@ class Token(dict):
 
     @property
     def issued(self):
-        return timeutils.parse_isotime(self.issued_str)
+        return _utils.parse_isotime(self.issued_str)
 
     @issued.setter
     def issued(self, value):
-        self.issued_str = timeutils.isotime(value)
+        self.issued_str = value.isoformat()
 
     @property
     def _user(self):

keystoneauth/fixture/v3.py

@@ -13,8 +13,7 @@
 import datetime
 import uuid
 
-from oslo_utils import timeutils
-
+from keystoneauth import _utils
 from keystoneauth.fixture import exception
 
 
@@ -77,7 +76,7 @@ class Token(dict):
         self.methods.extend(methods)
 
         if not issued:
-            issued = timeutils.utcnow() - datetime.timedelta(minutes=2)
+            issued = datetime.datetime.utcnow() - datetime.timedelta(minutes=2)
 
         try:
             self.issued = issued
@@ -132,11 +131,11 @@ class Token(dict):
 
     @property
     def expires(self):
-        return timeutils.parse_isotime(self.expires_str)
+        return _utils.parse_isotime(self.expires_str)
 
     @expires.setter
     def expires(self, value):
-        self.expires_str = timeutils.isotime(value, subsecond=True)
+        self.expires_str = value.isoformat()
 
     @property
     def issued_str(self):
@@ -148,11 +147,11 @@ class Token(dict):
 
     @property
     def issued(self):
-        return timeutils.parse_isotime(self.issued_str)
+        return _utils.parse_isotime(self.issued_str)
 
     @issued.setter
     def issued(self, value):
-        self.issued_str = timeutils.isotime(value, subsecond=True)
+        self.issued_str = value.isoformat()
 
     @property
     def _user(self):

keystoneauth/session.py

@@ -22,7 +22,6 @@ import time
 import uuid
 
 from oslo_config import cfg
-from oslo_utils import importutils
 import requests
 import six
 from six.moves import urllib
@@ -36,7 +35,10 @@ try:
 except ImportError:
     netaddr = None
 
-osprofiler_web = importutils.try_import("osprofiler.web")
+try:
+    import osprofiler.web as osprofiler_web
+except ImportError:
+    osprofiler_web = None
 
 USER_AGENT = 'keystoneauth'
 

keystoneauth/tests/unit/auth/test_identity_common.py

@@ -14,7 +14,6 @@ import abc
 import datetime
 import uuid
 
-from oslo_utils import timeutils
 import six
 
 from keystoneauth import access
@@ -191,7 +190,7 @@ class CommonIdentityTests(object):
         self.assertEqual(self.TEST_URL, auth_url)
 
     def _create_expired_auth_plugin(self, **kwargs):
-        expires = timeutils.utcnow() - datetime.timedelta(minutes=20)
+        expires = datetime.datetime.utcnow() - datetime.timedelta(minutes=20)
         expired_token = self.get_auth_data(expires=expires)
         expired_auth_ref = access.create(body=expired_token)
 

requirements.txt

@@ -4,9 +4,9 @@
 
 argparse
 Babel>=1.3
+iso8601>=0.1.9
 oslo.config>=1.9.3  # Apache-2.0
 oslo.i18n>=1.5.0  # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
 requests>=2.2.0,!=2.4.0
 six>=1.9.0
 stevedore>=1.3.0  # Apache-2.0