diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index ad7f5bcdf9..fd4227a6ba 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -15,6 +15,7 @@ import sys from keystoneclient.common import cms +from oslo.utils import timeutils import six from keystone.common import controller @@ -27,7 +28,6 @@ from keystone.i18n import _, _LI from keystone.openstack.common import importutils from keystone.openstack.common import jsonutils from keystone.openstack.common import log -from keystone.openstack.common import timeutils LOG = log.getLogger(__name__) diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py index bac3b083b8..58a56fa15d 100644 --- a/keystone/auth/plugins/oauth1.py +++ b/keystone/auth/plugins/oauth1.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils + from keystone import auth from keystone.common import controller from keystone.common import dependency @@ -20,7 +22,6 @@ from keystone.contrib.oauth1 import validator from keystone import exception from keystone.i18n import _ from keystone.openstack.common import log -from keystone.openstack.common import timeutils LOG = log.getLogger(__name__) diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py index 0881c95b96..997c4ed030 100644 --- a/keystone/auth/plugins/token.py +++ b/keystone/auth/plugins/token.py @@ -12,12 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils + from keystone import auth from keystone.common import dependency from keystone.common import wsgi from keystone import exception from keystone.openstack.common import log -from keystone.openstack.common import timeutils LOG = log.getLogger(__name__) diff --git a/keystone/common/cache/backends/mongo.py b/keystone/common/cache/backends/mongo.py index e7a3a035c8..0a30ea0bc1 100644 --- a/keystone/common/cache/backends/mongo.py +++ b/keystone/common/cache/backends/mongo.py @@ -17,13 +17,13 @@ import datetime from dogpile.cache import api from dogpile.cache import util as dp_util +from oslo.utils import timeutils import six from keystone import exception from keystone.i18n import _ from keystone.openstack.common import importutils from keystone.openstack.common import log -from keystone.openstack.common import timeutils NO_VALUE = api.NO_VALUE diff --git a/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py b/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py index 8d279ba3a9..909f4ae4b4 100644 --- a/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py +++ b/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py @@ -28,11 +28,11 @@ column. """ +from oslo.utils import strutils import sqlalchemy as sql from sqlalchemy.orm import sessionmaker from keystone.openstack.common import jsonutils -from keystone.openstack.common import strutils def _migrate_enabled_from_extra(migrate_engine, endpoint_table): diff --git a/keystone/common/sql/migrate_repo/versions/044_service_enabled.py b/keystone/common/sql/migrate_repo/versions/044_service_enabled.py index 0196e84ae6..fcb04c73e9 100644 --- a/keystone/common/sql/migrate_repo/versions/044_service_enabled.py +++ b/keystone/common/sql/migrate_repo/versions/044_service_enabled.py @@ -28,11 +28,11 @@ column. """ +from oslo.utils import strutils import sqlalchemy as sql from sqlalchemy.orm import sessionmaker from keystone.openstack.common import jsonutils -from keystone.openstack.common import strutils def _migrate_enabled_from_extra(migrate_engine, service_table): diff --git a/keystone/common/utils.py b/keystone/common/utils.py index bb9cd53195..4fe97c8a87 100644 --- a/keystone/common/utils.py +++ b/keystone/common/utils.py @@ -23,6 +23,7 @@ import hashlib import os import pwd +from oslo.utils import strutils import passlib.hash import six from six import moves @@ -33,7 +34,6 @@ from keystone import exception from keystone.i18n import _ from keystone.openstack.common import jsonutils from keystone.openstack.common import log -from keystone.openstack.common import strutils CONF = config.CONF diff --git a/keystone/contrib/access/core.py b/keystone/contrib/access/core.py index ff06bd504f..6e30ccc860 100644 --- a/keystone/contrib/access/core.py +++ b/keystone/contrib/access/core.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils import webob.dec from keystone.common import wsgi from keystone import config from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone.openstack.common import versionutils diff --git a/keystone/contrib/federation/utils.py b/keystone/contrib/federation/utils.py index fa3dd391a7..668841507f 100644 --- a/keystone/contrib/federation/utils.py +++ b/keystone/contrib/federation/utils.py @@ -15,13 +15,13 @@ import re import jsonschema +from oslo.utils import timeutils import six from keystone.common import config from keystone import exception from keystone.i18n import _ from keystone.openstack.common import log -from keystone.openstack.common import timeutils CONF = config.CONF diff --git a/keystone/contrib/oauth1/backends/sql.py b/keystone/contrib/oauth1/backends/sql.py index ee0e18595b..9ad6cd4d64 100644 --- a/keystone/contrib/oauth1/backends/sql.py +++ b/keystone/contrib/oauth1/backends/sql.py @@ -16,6 +16,7 @@ import datetime import random import uuid +from oslo.utils import timeutils import six from keystone.common import sql @@ -23,7 +24,6 @@ from keystone.contrib.oauth1 import core from keystone import exception from keystone.i18n import _ from keystone.openstack.common import jsonutils -from keystone.openstack.common import timeutils class Consumer(sql.ModelBase, sql.DictBase): diff --git a/keystone/contrib/oauth1/controllers.py b/keystone/contrib/oauth1/controllers.py index ab3fdefd23..4759bdee0d 100644 --- a/keystone/contrib/oauth1/controllers.py +++ b/keystone/contrib/oauth1/controllers.py @@ -14,6 +14,8 @@ """Extensions supporting OAuth1.""" +from oslo.utils import timeutils + from keystone.common import controller from keystone.common import dependency from keystone.common import wsgi @@ -23,7 +25,6 @@ from keystone.contrib.oauth1 import validator from keystone import exception from keystone.i18n import _ from keystone.openstack.common import jsonutils -from keystone.openstack.common import timeutils CONF = config.CONF diff --git a/keystone/contrib/revoke/backends/kvs.py b/keystone/contrib/revoke/backends/kvs.py index de87f1b8fe..4a51bc1a72 100644 --- a/keystone/contrib/revoke/backends/kvs.py +++ b/keystone/contrib/revoke/backends/kvs.py @@ -12,11 +12,12 @@ import datetime +from oslo.utils import timeutils + from keystone.common import kvs from keystone import config from keystone.contrib import revoke from keystone import exception -from keystone.openstack.common import timeutils CONF = config.CONF diff --git a/keystone/contrib/revoke/controllers.py b/keystone/contrib/revoke/controllers.py index 50a1119aac..7f0ee1f137 100644 --- a/keystone/contrib/revoke/controllers.py +++ b/keystone/contrib/revoke/controllers.py @@ -10,11 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils + from keystone.common import controller from keystone.common import dependency from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import timeutils @dependency.requires('revoke_api') diff --git a/keystone/contrib/revoke/core.py b/keystone/contrib/revoke/core.py index 8f3cb06c0c..1df99bd471 100644 --- a/keystone/contrib/revoke/core.py +++ b/keystone/contrib/revoke/core.py @@ -13,6 +13,7 @@ import abc import datetime +from oslo.utils import timeutils import six from keystone.common import cache @@ -25,7 +26,6 @@ from keystone import exception from keystone.i18n import _ from keystone import notifications from keystone.openstack.common import log -from keystone.openstack.common import timeutils CONF = config.CONF diff --git a/keystone/contrib/revoke/model.py b/keystone/contrib/revoke/model.py index 0e1cae33af..e2cd0be0a7 100644 --- a/keystone/contrib/revoke/model.py +++ b/keystone/contrib/revoke/model.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from keystone.openstack.common import timeutils +from oslo.utils import timeutils + # The set of attributes common between the RevokeEvent # and the dictionaries created from the token Data. diff --git a/keystone/exception.py b/keystone/exception.py index 79759ec614..b07fa32981 100644 --- a/keystone/exception.py +++ b/keystone/exception.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import encodeutils import six from keystone.common import config from keystone.i18n import _ from keystone.openstack.common import log -from keystone.openstack.common import strutils CONF = config.CONF @@ -62,7 +62,7 @@ class Error(Exception): message = self.message_format % kwargs except UnicodeDecodeError: try: - kwargs = dict([(k, strutils.safe_decode(v)) for k, v in + kwargs = dict([(k, encodeutils.safe_decode(v)) for k, v in six.iteritems(kwargs)]) except UnicodeDecodeError: # NOTE(jamielennox): This is the complete failure case diff --git a/keystone/models/token_model.py b/keystone/models/token_model.py index 5c63fa8215..1338428099 100644 --- a/keystone/models/token_model.py +++ b/keystone/models/token_model.py @@ -12,12 +12,12 @@ """Unified in-memory token model.""" +from oslo.utils import timeutils import six from keystone.common import config from keystone import exception from keystone.i18n import _ -from keystone.openstack.common import timeutils CONF = config.CONF diff --git a/keystone/tests/test_auth.py b/keystone/tests/test_auth.py index a298d57830..4979028ac8 100644 --- a/keystone/tests/test_auth.py +++ b/keystone/tests/test_auth.py @@ -17,6 +17,7 @@ import datetime import uuid import mock +from oslo.utils import timeutils from keystone import assignment from keystone import auth @@ -24,7 +25,6 @@ from keystone.common import authorization from keystone.common import environment from keystone import config from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import default_fixtures from keystone.tests.ksfixtures import database diff --git a/keystone/tests/test_backend.py b/keystone/tests/test_backend.py index 32c7cb0fb5..1ba4c5d883 100644 --- a/keystone/tests/test_backend.py +++ b/keystone/tests/test_backend.py @@ -19,13 +19,13 @@ import mock import uuid from keystoneclient.common import cms +from oslo.utils import timeutils import six from testtools import matchers from keystone.common import driver_hints from keystone import config from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import default_fixtures from keystone.tests import filtering diff --git a/keystone/tests/test_backend_kvs.py b/keystone/tests/test_backend_kvs.py index 960e3272bc..7d2949e642 100644 --- a/keystone/tests/test_backend_kvs.py +++ b/keystone/tests/test_backend_kvs.py @@ -14,10 +14,10 @@ import datetime import uuid +from oslo.utils import timeutils import six from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import default_fixtures from keystone.tests.ksfixtures import database diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py index a15583ac7c..aa39d6d0eb 100644 --- a/keystone/tests/test_keystoneclient.py +++ b/keystone/tests/test_keystoneclient.py @@ -18,10 +18,10 @@ import uuid import webob import mock +from oslo.utils import timeutils from keystone import config from keystone.openstack.common import jsonutils -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import default_fixtures from keystone.tests.ksfixtures import appserver diff --git a/keystone/tests/test_revoke.py b/keystone/tests/test_revoke.py index 9079a105cb..960de0282b 100644 --- a/keystone/tests/test_revoke.py +++ b/keystone/tests/test_revoke.py @@ -15,13 +15,13 @@ import datetime import uuid import mock +from oslo.utils import timeutils from testtools import matchers from keystone.common import dependency from keystone import config from keystone.contrib.revoke import model from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import test_backend_sql diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/test_token_provider.py index dbaf8047cd..3fcea469f4 100644 --- a/keystone/tests/test_token_provider.py +++ b/keystone/tests/test_token_provider.py @@ -14,9 +14,10 @@ import datetime +from oslo.utils import timeutils + from keystone import config from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import default_fixtures from keystone import token diff --git a/keystone/tests/test_v3.py b/keystone/tests/test_v3.py index a2a42ee454..da06f5294d 100644 --- a/keystone/tests/test_v3.py +++ b/keystone/tests/test_v3.py @@ -16,6 +16,7 @@ import datetime import uuid from lxml import etree +from oslo.utils import timeutils import six from testtools import matchers @@ -26,7 +27,6 @@ from keystone.common import serializer from keystone import config from keystone import exception from keystone import middleware -from keystone.openstack.common import timeutils from keystone.policy.backends import rules from keystone import tests from keystone.tests.ksfixtures import database diff --git a/keystone/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py index cf9f5cc7a6..153e4e1a77 100644 --- a/keystone/tests/test_v3_auth.py +++ b/keystone/tests/test_v3_auth.py @@ -19,12 +19,12 @@ from testtools import testcase import uuid from keystoneclient.common import cms +from oslo.utils import timeutils from keystone import auth from keystone.common import dependency from keystone import config from keystone import exception -from keystone.openstack.common import timeutils from keystone import tests from keystone.tests import test_v3 diff --git a/keystone/tests/test_v3_os_revoke.py b/keystone/tests/test_v3_os_revoke.py index be93a563fe..c542877264 100644 --- a/keystone/tests/test_v3_os_revoke.py +++ b/keystone/tests/test_v3_os_revoke.py @@ -13,11 +13,11 @@ import datetime import uuid +from oslo.utils import timeutils import six from keystone.common import dependency from keystone.contrib.revoke import model -from keystone.openstack.common import timeutils from keystone.tests import test_v3 from keystone.token import provider diff --git a/keystone/tests/unit/token/test_token_model.py b/keystone/tests/unit/token/test_token_model.py index 4e613953c4..d944f0864f 100644 --- a/keystone/tests/unit/token/test_token_model.py +++ b/keystone/tests/unit/token/test_token_model.py @@ -13,10 +13,11 @@ import copy import uuid +from oslo.utils import timeutils + from keystone.common import config from keystone import exception from keystone.models import token_model -from keystone.openstack.common import timeutils from keystone.tests import core from keystone.tests import test_token_provider diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index b119239a29..8f99b7eeeb 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -16,6 +16,7 @@ import datetime import sys from keystoneclient.common import cms +from oslo.utils import timeutils import six from keystone.common import controller @@ -26,7 +27,6 @@ from keystone import exception from keystone.i18n import _ from keystone.openstack.common import jsonutils from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone.token import provider diff --git a/keystone/token/persistence/backends/kvs.py b/keystone/token/persistence/backends/kvs.py index 57be402765..02707780a6 100644 --- a/keystone/token/persistence/backends/kvs.py +++ b/keystone/token/persistence/backends/kvs.py @@ -16,6 +16,7 @@ from __future__ import absolute_import import copy +from oslo.utils import timeutils import six from keystone.common import kvs @@ -23,7 +24,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone import token from keystone.token import provider diff --git a/keystone/token/persistence/backends/sql.py b/keystone/token/persistence/backends/sql.py index 57f9b6ae64..b77ff6b2d7 100644 --- a/keystone/token/persistence/backends/sql.py +++ b/keystone/token/persistence/backends/sql.py @@ -15,12 +15,13 @@ import copy import functools +from oslo.utils import timeutils + from keystone.common import sql from keystone import config from keystone import exception from keystone.i18n import _LI from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone import token from keystone.token import provider diff --git a/keystone/token/persistence/core.py b/keystone/token/persistence/core.py index 6f2ffe66a4..2a83a23959 100644 --- a/keystone/token/persistence/core.py +++ b/keystone/token/persistence/core.py @@ -17,6 +17,7 @@ import abc import copy +from oslo.utils import timeutils import six from keystone.common import cache @@ -25,7 +26,6 @@ from keystone.common import manager from keystone import config from keystone import exception from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone.openstack.common import versionutils diff --git a/keystone/token/provider.py b/keystone/token/provider.py index aa699ae7f4..5ad7b25766 100644 --- a/keystone/token/provider.py +++ b/keystone/token/provider.py @@ -19,6 +19,7 @@ import datetime import sys from keystoneclient.common import cms +from oslo.utils import timeutils import six from keystone.common import cache @@ -29,7 +30,6 @@ from keystone import exception from keystone.i18n import _ from keystone.models import token_model from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone.openstack.common import versionutils from keystone.token import persistence diff --git a/keystone/token/providers/common.py b/keystone/token/providers/common.py index 8a3ccb2ac8..00e871e85a 100644 --- a/keystone/token/providers/common.py +++ b/keystone/token/providers/common.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import timeutils import six from six.moves.urllib import parse @@ -26,7 +27,6 @@ from keystone.token import provider from keystone.openstack.common import log -from keystone.openstack.common import timeutils LOG = log.getLogger(__name__) diff --git a/keystone/trust/backends/kvs.py b/keystone/trust/backends/kvs.py index 928a85b5a1..80d5a98ea6 100644 --- a/keystone/trust/backends/kvs.py +++ b/keystone/trust/backends/kvs.py @@ -17,9 +17,10 @@ only to be used for testing purposes """ import copy +from oslo.utils import timeutils + from keystone.common import kvs from keystone import exception -from keystone.openstack.common import timeutils from keystone import trust as keystone_trust diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py index 8f579f3b3f..9bd8df27b1 100644 --- a/keystone/trust/backends/sql.py +++ b/keystone/trust/backends/sql.py @@ -14,10 +14,11 @@ import time +from oslo.utils import timeutils + from keystone.common import sql from keystone import exception from keystone.openstack.common import log -from keystone.openstack.common import timeutils from keystone import trust diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py index 7a497854d0..9416938338 100644 --- a/keystone/trust/controllers.py +++ b/keystone/trust/controllers.py @@ -14,6 +14,7 @@ import uuid +from oslo.utils import timeutils import six from keystone import assignment @@ -23,7 +24,6 @@ from keystone import config from keystone import exception from keystone.i18n import _ from keystone.openstack.common import log -from keystone.openstack.common import timeutils LOG = log.getLogger(__name__)