diff --git a/keystoneclient/adapter.py b/keystoneclient/adapter.py index e14ce7df6..e8e0a29af 100644 --- a/keystoneclient/adapter.py +++ b/keystoneclient/adapter.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from keystoneclient import utils diff --git a/keystoneclient/hacking/checks.py b/keystoneclient/hacking/checks.py index 8481f80c7..df2c96093 100644 --- a/keystoneclient/hacking/checks.py +++ b/keystoneclient/hacking/checks.py @@ -24,8 +24,8 @@ import re def check_oslo_namespace_imports(logical_line, blank_before, filename): oslo_namespace_imports = re.compile( - r"(((from)|(import))\s+oslo\.utils)|" - "(from\s+oslo\s+import\s+utils)") + r"(((from)|(import))\s+oslo\.((serialization)|(utils)))|" + "(from\s+oslo\s+import\s+((serialization)|(utils)))") if re.match(oslo_namespace_imports, logical_line): msg = ("K333: '%s' must be used instead of '%s'.") % ( diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 84b314e98..327029522 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -21,7 +21,7 @@ OpenStack Client interface. Handles the REST calls and responses. import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import pkg_resources import requests from six.moves.urllib import parse as urlparse diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 29b819b3e..f7a4add6f 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -158,7 +158,7 @@ import time import netaddr from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils import requests import six diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py index b27b9ce95..755289347 100644 --- a/keystoneclient/middleware/s3_token.py +++ b/keystoneclient/middleware/s3_token.py @@ -33,7 +33,7 @@ This WSGI component: import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import six from six.moves import urllib diff --git a/keystoneclient/session.py b/keystoneclient/session.py index 3ac6d600e..b3ae6333c 100644 --- a/keystoneclient/session.py +++ b/keystoneclient/session.py @@ -18,7 +18,7 @@ import os import time from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import importutils import requests import six diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py index 66b04d947..09b4b7a2c 100644 --- a/keystoneclient/tests/client_fixtures.py +++ b/keystoneclient/tests/client_fixtures.py @@ -15,7 +15,7 @@ import os import fixtures -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils import six import testresources @@ -551,11 +551,23 @@ class HackingCode(fixtures.Fixture): from oslo import utils from oslo.utils import encodeutils from oslo_utils import encodeutils + + import oslo.serialization + import oslo_serialization + import oslo.serialization.jsonutils + import oslo_serialization.jsonutils + from oslo import serialization + from oslo.serialization import jsonutils + from oslo_serialization import jsonutils """, 'expected_errors': [ (1, 0, 'K333'), (3, 0, 'K333'), (5, 0, 'K333'), (6, 0, 'K333'), + (9, 0, 'K333'), + (11, 0, 'K333'), + (13, 0, 'K333'), + (14, 0, 'K333'), ], } diff --git a/keystoneclient/tests/generic/test_client.py b/keystoneclient/tests/generic/test_client.py index e5f87360d..6100f0a1c 100644 --- a/keystoneclient/tests/generic/test_client.py +++ b/keystoneclient/tests/generic/test_client.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from keystoneclient.generic import client from keystoneclient.tests import utils diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index 388a7ce33..9e0bad186 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -25,7 +25,7 @@ import uuid import fixtures import iso8601 import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils from requests_mock.contrib import fixture as mock_fixture import six diff --git a/keystoneclient/tests/test_discovery.py b/keystoneclient/tests/test_discovery.py index f9d3df28a..9587f4b97 100644 --- a/keystoneclient/tests/test_discovery.py +++ b/keystoneclient/tests/test_discovery.py @@ -13,7 +13,7 @@ import re import uuid -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from testtools import matchers diff --git a/keystoneclient/tests/test_s3_token_middleware.py b/keystoneclient/tests/test_s3_token_middleware.py index 25fc29e74..037dccae6 100644 --- a/keystoneclient/tests/test_s3_token_middleware.py +++ b/keystoneclient/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 import six import testtools diff --git a/keystoneclient/tests/test_session.py b/keystoneclient/tests/test_session.py index d3d964cfd..74258dbb9 100644 --- a/keystoneclient/tests/test_session.py +++ b/keystoneclient/tests/test_session.py @@ -17,7 +17,7 @@ import uuid import mock from oslo.config import cfg from oslo.config import fixture as config -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import six from testtools import matchers diff --git a/keystoneclient/tests/utils.py b/keystoneclient/tests/utils.py index 290d1691e..038f34c7e 100644 --- a/keystoneclient/tests/utils.py +++ b/keystoneclient/tests/utils.py @@ -18,7 +18,7 @@ import uuid import fixtures import mock from mox3 import mox -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from requests_mock.contrib import fixture import six diff --git a/keystoneclient/tests/v2_0/test_auth.py b/keystoneclient/tests/v2_0/test_auth.py index ddf8f3910..c4d5046bc 100644 --- a/keystoneclient/tests/v2_0/test_auth.py +++ b/keystoneclient/tests/v2_0/test_auth.py @@ -13,7 +13,7 @@ import copy import datetime -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import timeutils from keystoneclient import exceptions diff --git a/keystoneclient/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py index 44943a02a..dd195bafd 100644 --- a/keystoneclient/tests/v2_0/test_shell.py +++ b/keystoneclient/tests/v2_0/test_shell.py @@ -14,7 +14,7 @@ import os import sys import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from testtools import matchers diff --git a/keystoneclient/tests/v3/test_auth.py b/keystoneclient/tests/v3/test_auth.py index 14a762f3f..59f5de5af 100644 --- a/keystoneclient/tests/v3/test_auth.py +++ b/keystoneclient/tests/v3/test_auth.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from keystoneclient import exceptions from keystoneclient.tests.v3 import utils diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py index 2c1f666cf..8becfab92 100644 --- a/keystoneclient/v3/client.py +++ b/keystoneclient/v3/client.py @@ -15,7 +15,7 @@ import logging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import exceptions