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:
Steve Martinelli
2014-10-04 01:33:35 -04:00
parent aa5abc0d0d
commit faa6aed1a8
32 changed files with 35 additions and 33 deletions

View File

@@ -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):

View File

@@ -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