Merge "Change oslo.serialization to oslo_serialization"

keystone/auth/controllers.py

@@ -15,7 +15,7 @@
 import sys
 
 from keystoneclient.common import cms
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
 import six

keystone/auth/plugins/mapped.py

@@ -12,7 +12,7 @@
 
 import functools
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from pycadf import cadftaxonomy as taxonomy
 from six.moves.urllib import parse
 

keystone/common/sql/core.py

@@ -26,7 +26,7 @@ from oslo.db import exception as db_exception
 from oslo.db import options as db_options
 from oslo.db.sqlalchemy import models
 from oslo.db.sqlalchemy import session as db_session
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import sqlalchemy as sql
 from sqlalchemy.ext import declarative

keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py

@@ -28,7 +28,7 @@ column.
 
 """
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import sqlalchemy as sql
 from sqlalchemy.orm import Session

keystone/common/sql/migrate_repo/versions/044_service_enabled.py

@@ -28,7 +28,7 @@ column.
 
 """
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import sqlalchemy as sql
 from sqlalchemy.orm import sessionmaker

keystone/common/sql/migration_helpers.py

@@ -20,7 +20,7 @@ import sys
 import migrate
 from migrate import exceptions
 from oslo.db.sqlalchemy import migration
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import six
 import sqlalchemy

keystone/common/utils.py

@@ -23,7 +23,7 @@ import hashlib
 import os
 import pwd
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import passlib.hash
 import six

keystone/common/wsgi.py

@@ -21,7 +21,7 @@
 import copy
 
 from oslo import i18n
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import strutils
 import routes.middleware

keystone/contrib/ec2/controllers.py

@@ -37,7 +37,7 @@ import sys
 import uuid
 
 from keystoneclient.contrib.ec2 import utils as ec2_utils
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from keystone.common import controller

keystone/contrib/federation/backends/sql.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone.common import sql
 from keystone.contrib.federation import core

keystone/contrib/oauth1/backends/sql.py

@@ -16,7 +16,7 @@ import datetime
 import random
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
 

keystone/contrib/oauth1/controllers.py

@@ -14,7 +14,7 @@
 
 """Extensions supporting OAuth1."""
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
 from keystone.common import controller

keystone/controllers.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob
 
 from keystone.common import extension

keystone/credential/controllers.py

@@ -14,7 +14,7 @@
 
 import hashlib
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone.common import controller
 from keystone.common import dependency

keystone/hacking/checks.py

@@ -399,8 +399,8 @@ class CheckForLoggingIssues(BaseASTChecker):
 
 def check_oslo_namespace_imports(logical_line, blank_before, filename):
     oslo_namespace_imports = re.compile(
-        r"(((from)|(import))\s+oslo\.utils)|"
+        r"(((from)|(import))\s+oslo\.((serialization)|(utils)))|"
-        "(from\s+oslo\s+import\s+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'.") % (

keystone/middleware/core.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.serialization import jsonutils
 from oslo_middleware import sizelimit
+from oslo_serialization import jsonutils
 import six
 
 from keystone.common import authorization

keystone/tests/ksfixtures/hacking.py

@@ -188,12 +188,24 @@ 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'),
         ],
     }
 

keystone/tests/rest.py

@@ -15,7 +15,7 @@
 import io
 
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import webtest
 

keystone/tests/test_exception.py

@@ -14,7 +14,7 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from keystone.common import wsgi

keystone/tests/test_keystoneclient.py

@@ -18,7 +18,7 @@ import uuid
 from keystoneclient import exceptions as client_exceptions
 from keystoneclient.v2_0 import client as ks_client
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import webob
 

keystone/tests/test_v3.py

@@ -15,7 +15,7 @@
 import datetime
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
 from testtools import matchers

keystone/tests/test_v3_federation.py

@@ -17,7 +17,7 @@ import uuid
 
 from lxml import etree
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslotest import mockpatch
 import saml2
 from saml2 import saml

keystone/tests/test_v3_filters.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone import config
 from keystone.policy.backends import rules

keystone/tests/test_v3_oauth1.py

@@ -15,7 +15,7 @@
 import copy
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from six.moves import urllib
 
 from keystone import config

keystone/tests/test_v3_protection.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone import config
 from keystone import exception

keystone/tests/test_versions.py

@@ -18,7 +18,7 @@ import functools
 import random
 
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from testtools import matchers as tt_matchers
 
 from keystone.common import json_home

keystone/tests/test_wsgi.py

@@ -18,7 +18,7 @@ import uuid
 
 import mock
 from oslo import i18n
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 from testtools import matchers
 import webob

keystone/tests/unit/common/test_utils.py

@@ -13,7 +13,7 @@
 import datetime
 import uuid
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone.common import utils as common_utils
 from keystone import config

keystone/token/controllers.py

@@ -16,7 +16,7 @@ import datetime
 import sys
 
 from keystoneclient.common import cms
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
 

keystone/token/providers/common.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six
 from six.moves.urllib import parse

keystone/token/providers/pki.py

@@ -15,7 +15,7 @@
 """Keystone PKI Token Provider"""
 
 from keystoneclient.common import cms
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone.common import environment
 from keystone.common import utils

keystone/token/providers/pkiz.py

@@ -13,7 +13,7 @@
 """Keystone Compressed PKI Token Provider"""
 
 from keystoneclient.common import cms
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from keystone.common import environment
 from keystone.common import utils