Use jsonutils from oslo.serialization
Rather than sync'ing with oslo-incubator, let's use the library oslo.serialization instead. We can't remove jsonutils under keystone/openstack/common/ because it's still used by other common functions. Change-Id: Ic3e8d621616dd1cf14ac1446405896f2dc61288b
This commit is contained in:
parent
aa5abc0d0d
commit
faa6aed1a8
|
@ -15,6 +15,7 @@
|
|||
import sys
|
||||
|
||||
from keystoneclient.common import cms
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import six
|
||||
|
||||
|
@ -28,7 +29,6 @@ from keystone.contrib import federation
|
|||
from keystone import exception
|
||||
from keystone.i18n import _, _LI
|
||||
from keystone.openstack.common import importutils
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
import functools
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from pycadf import cadftaxonomy as taxonomy
|
||||
from six.moves.urllib import parse
|
||||
|
||||
|
@ -21,7 +22,6 @@ from keystone.contrib import federation
|
|||
from keystone.contrib.federation import utils
|
||||
from keystone.models import token_model
|
||||
from keystone import notifications
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
@dependency.requires('federation_api', 'identity_api', 'token_provider_api')
|
||||
|
|
|
@ -26,6 +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
|
||||
import six
|
||||
import sqlalchemy as sql
|
||||
from sqlalchemy.ext import declarative
|
||||
|
@ -35,7 +36,6 @@ from sqlalchemy import types as sql_types
|
|||
from keystone.common import utils
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
|
|
|
@ -28,12 +28,11 @@ column.
|
|||
|
||||
"""
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import strutils
|
||||
import sqlalchemy as sql
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
def _migrate_enabled_from_extra(migrate_engine, endpoint_table):
|
||||
"""Remove `enabled` from `extra`, put it in the `enabled` column."""
|
||||
|
|
|
@ -28,12 +28,11 @@ column.
|
|||
|
||||
"""
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import strutils
|
||||
import sqlalchemy as sql
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
def _migrate_enabled_from_extra(migrate_engine, service_table):
|
||||
"""Remove `enabled` from `extra`, put it in the `enabled` column."""
|
||||
|
|
|
@ -20,6 +20,7 @@ import sys
|
|||
import migrate
|
||||
from migrate import exceptions
|
||||
from oslo.db.sqlalchemy import migration
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
import sqlalchemy
|
||||
|
||||
|
@ -30,7 +31,6 @@ from keystone import contrib
|
|||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import importutils
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
|
|
@ -23,6 +23,7 @@ import hashlib
|
|||
import os
|
||||
import pwd
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import strutils
|
||||
import passlib.hash
|
||||
import six
|
||||
|
@ -32,7 +33,6 @@ from keystone.common import config
|
|||
from keystone.common import environment
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
import copy
|
||||
|
||||
from oslo import i18n
|
||||
from oslo.serialization import jsonutils
|
||||
import routes.middleware
|
||||
import six
|
||||
import webob.dec
|
||||
|
@ -35,7 +36,6 @@ from keystone.i18n import _LI
|
|||
from keystone.i18n import _LW
|
||||
from keystone.models import token_model
|
||||
from keystone.openstack.common import importutils
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
|
|
|
@ -37,6 +37,7 @@ import sys
|
|||
import uuid
|
||||
|
||||
from keystoneclient.contrib.ec2 import utils as ec2_utils
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
|
||||
from keystone.common import controller
|
||||
|
@ -46,7 +47,6 @@ from keystone.common import wsgi
|
|||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.models import token_model
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
@dependency.requires('assignment_api', 'catalog_api', 'credential_api',
|
||||
|
|
|
@ -12,10 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone.common import sql
|
||||
from keystone.contrib.federation import core
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
class FederationProtocolModel(sql.ModelBase, sql.DictBase):
|
||||
|
|
|
@ -16,6 +16,7 @@ import datetime
|
|||
import random
|
||||
import uuid
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import six
|
||||
|
||||
|
@ -23,7 +24,6 @@ from keystone.common import sql
|
|||
from keystone.contrib.oauth1 import core
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
class Consumer(sql.ModelBase, sql.DictBase):
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
"""Extensions supporting OAuth1."""
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
|
||||
from keystone.common import controller
|
||||
|
@ -26,7 +27,6 @@ from keystone import exception
|
|||
from keystone.i18n import _
|
||||
from keystone.models import token_model
|
||||
from keystone import notifications
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
import webob
|
||||
|
||||
from keystone.common import extension
|
||||
from keystone.common import json_home
|
||||
from keystone.common import wsgi
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
|
||||
|
||||
|
|
|
@ -14,13 +14,14 @@
|
|||
|
||||
import hashlib
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone.common import controller
|
||||
from keystone.common import dependency
|
||||
from keystone.common import validation
|
||||
from keystone.credential import schema
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
@dependency.requires('credential_api')
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
import webob.dec
|
||||
|
||||
|
@ -23,7 +24,6 @@ from keystone.common import wsgi
|
|||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.models import token_model
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone.openstack.common import versionutils
|
||||
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
import io
|
||||
|
||||
from lxml import etree
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
import webtest
|
||||
|
||||
from keystone.auth import controllers as auth_controllers
|
||||
from keystone.common import serializer
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
from keystone.tests import default_fixtures
|
||||
from keystone.tests.ksfixtures import database
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
import uuid
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
|
||||
from keystone.common import wsgi
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
|
||||
|
||||
|
|
|
@ -17,11 +17,11 @@ import os
|
|||
import uuid
|
||||
|
||||
import mock
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import webob
|
||||
|
||||
from keystone import config
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
from keystone.tests import default_fixtures
|
||||
from keystone.tests.ksfixtures import appserver
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
import webob
|
||||
|
||||
from keystone import config
|
||||
from keystone import middleware
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ import datetime
|
|||
import uuid
|
||||
|
||||
from lxml import etree
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import six
|
||||
from testtools import matchers
|
||||
|
@ -27,7 +28,6 @@ from keystone.common import serializer
|
|||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone import middleware
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.policy.backends import rules
|
||||
from keystone import tests
|
||||
from keystone.tests.ksfixtures import database
|
||||
|
|
|
@ -17,6 +17,7 @@ import uuid
|
|||
|
||||
from lxml import etree
|
||||
import mock
|
||||
from oslo.serialization import jsonutils
|
||||
from oslotest import mockpatch
|
||||
import saml2
|
||||
from saml2 import saml
|
||||
|
@ -32,7 +33,6 @@ from keystone.contrib.federation import idp as keystone_idp
|
|||
from keystone.contrib.federation import utils as mapping_utils
|
||||
from keystone import exception
|
||||
from keystone import notifications
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone.tests import federation_fixtures
|
||||
from keystone.tests import mapping_fixtures
|
||||
|
|
|
@ -15,8 +15,9 @@
|
|||
|
||||
import uuid
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone import config
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.policy.backends import rules
|
||||
from keystone.tests import filtering
|
||||
from keystone.tests.ksfixtures import temporaryfile
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
import copy
|
||||
import uuid
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from six.moves import urllib
|
||||
|
||||
from keystone import config
|
||||
|
@ -22,7 +23,6 @@ from keystone.contrib import oauth1
|
|||
from keystone.contrib.oauth1 import controllers
|
||||
from keystone.contrib.oauth1 import core
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.tests.ksfixtures import temporaryfile
|
||||
from keystone.tests import test_v3
|
||||
|
||||
|
|
|
@ -15,9 +15,10 @@
|
|||
|
||||
import uuid
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.policy.backends import rules
|
||||
from keystone import tests
|
||||
from keystone.tests.ksfixtures import temporaryfile
|
||||
|
|
|
@ -18,12 +18,12 @@ import functools
|
|||
import random
|
||||
|
||||
import mock
|
||||
from oslo.serialization import jsonutils
|
||||
from testtools import matchers as tt_matchers
|
||||
|
||||
from keystone.common import json_home
|
||||
from keystone import config
|
||||
from keystone import controllers
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
from keystone.tests import matchers
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ import uuid
|
|||
|
||||
import mock
|
||||
from oslo import i18n
|
||||
from oslo.serialization import jsonutils
|
||||
import six
|
||||
from testtools import matchers
|
||||
import webob
|
||||
|
@ -25,7 +26,6 @@ import webob
|
|||
from keystone.common import environment
|
||||
from keystone.common import wsgi
|
||||
from keystone import exception
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone import tests
|
||||
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ import datetime
|
|||
import sys
|
||||
|
||||
from keystoneclient.common import cms
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import six
|
||||
|
||||
|
@ -26,7 +27,6 @@ from keystone import config
|
|||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.models import token_model
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone.token import provider
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo.utils import timeutils
|
||||
import six
|
||||
from six.moves.urllib import parse
|
||||
|
@ -21,7 +22,6 @@ from keystone import config
|
|||
from keystone.contrib import federation
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone import token
|
||||
from keystone.token import provider
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
"""Keystone PKI Token Provider"""
|
||||
|
||||
from keystoneclient.common import cms
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone.common import environment
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone.token.providers import common
|
||||
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
"""Keystone Compressed PKI Token Provider"""
|
||||
|
||||
from keystoneclient.common import cms
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from keystone.common import environment
|
||||
from keystone import config
|
||||
from keystone import exception
|
||||
from keystone.i18n import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import log
|
||||
from keystone.token.providers import common
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
module=config
|
||||
module=gettextutils
|
||||
module=importutils
|
||||
module=jsonutils
|
||||
module=log
|
||||
module=policy
|
||||
module=processutils
|
||||
|
|
|
@ -22,6 +22,7 @@ oslo.config>=1.4.0 # Apache-2.0
|
|||
oslo.messaging>=1.4.0
|
||||
oslo.db>=1.0.0 # Apache-2.0
|
||||
oslo.i18n>=1.0.0 # Apache-2.0
|
||||
oslo.serialization>=1.0.0 # Apache-2.0
|
||||
oslo.utils>=1.0.0 # Apache-2.0
|
||||
Babel>=1.3
|
||||
oauthlib>=0.6
|
||||
|
|
Loading…
Reference in New Issue