diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-07 08:07:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-07 08:07:25 +0000 |
| commit | 77f6fba43388c2daf43ed7ac71df84c51fafee82 (patch) | |
| tree | 7d0cdd9fc95c5a18741908f9476189f6d52c00b4 | |
| parent | 773bdd8c0087d75e8e0d8b162aec9c8e81b2f2ce (diff) | |
| parent | 4010736efd472ff3160a523cfcc866c7fe04e3ff (diff) | |
| download | keystonemiddleware-77f6fba43388c2daf43ed7ac71df84c51fafee82.tar.gz | |
Merge "Switch from oslo.serialization to oslo_serialization"
| -rw-r--r-- | keystonemiddleware/auth_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/ec2_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/s3_token.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/tests/client_fixtures.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/tests/test_auth_token_middleware.py | 2 | ||||
| -rw-r--r-- | keystonemiddleware/tests/test_s3_token_middleware.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py index b816cb9..9d5e9dd 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 6bb26e9..11db7d5 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 37bcf4c..d56482f 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 1077f3b..26ca09d 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 d8b92d8..e007e98 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 bf94391..fdadb76 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 |