Merge "Change oslo.serialization to oslo_serialization"

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
 

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'.") % (

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

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

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

keystoneclient/session.py

@@ -19,7 +19,7 @@ import socket
 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

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'),
         ],
     }

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

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

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
 

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

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

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

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

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
 

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

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