diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py index fdda2c0c..f6e53fbf 100644 --- a/keystonemiddleware/auth_token.py +++ b/keystonemiddleware/auth_token.py @@ -189,7 +189,7 @@ from keystoneclient import discover from keystoneclient import exceptions from keystoneclient import session from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils import six from six.moves import urllib diff --git a/keystonemiddleware/ec2_token.py b/keystonemiddleware/ec2_token.py index 6bb26e98..11db7d5c 100644 --- a/keystonemiddleware/ec2_token.py +++ b/keystonemiddleware/ec2_token.py @@ -21,7 +21,7 @@ Starting point for routing EC2 requests. """ from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import webob.dec import webob.exc diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py index 37bcf4c5..d56482fd 100644 --- a/keystonemiddleware/s3_token.py +++ b/keystonemiddleware/s3_token.py @@ -34,7 +34,7 @@ This WSGI component: import logging import webob -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import six from six.moves import urllib diff --git a/keystonemiddleware/tests/client_fixtures.py b/keystonemiddleware/tests/client_fixtures.py index 1077f3be..26ca09d9 100644 --- a/keystonemiddleware/tests/client_fixtures.py +++ b/keystonemiddleware/tests/client_fixtures.py @@ -18,7 +18,7 @@ import fixtures from keystoneclient.common import cms from keystoneclient import fixture from keystoneclient import utils -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils import six import testresources diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py index d8b92d87..e007e98d 100644 --- a/keystonemiddleware/tests/test_auth_token_middleware.py +++ b/keystonemiddleware/tests/test_auth_token_middleware.py @@ -32,7 +32,7 @@ from keystoneclient import fixture from keystoneclient import session import mock from oslo.config import fixture as cfg_fixture -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils from requests_mock.contrib import fixture as rm_fixture import six diff --git a/keystonemiddleware/tests/test_s3_token_middleware.py b/keystonemiddleware/tests/test_s3_token_middleware.py index bf943911..fdadb76b 100644 --- a/keystonemiddleware/tests/test_s3_token_middleware.py +++ b/keystonemiddleware/tests/test_s3_token_middleware.py @@ -13,7 +13,7 @@ # under the License. import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from requests_mock.contrib import fixture as rm_fixture import six