Merge "Obsolete oslo-incubator modules - jsonutils (now oslo.serialization)"

openstack-common.conf

@@ -6,7 +6,6 @@ module=eventlet_backdoor
 module=exception
 module=fileutils
 module=gettextutils
-module=jsonutils
 module=local
 module=log
 module=loopingcall

requirements.txt

@@ -28,7 +28,8 @@ jsonschema>=2.0.0,<3.0.0
 Jinja2>=2.6  # BSD License (3 clause)
 pexpect>=3.1 # ISC License
 oslo.config>=1.4.0  # Apache-2.0
-oslo.utils>=1.1.0                       # Apache-2.0
+oslo.serialization>=1.0.0
+oslo.utils>=1.1.0
 MySQL-python
 Babel>=1.3
 six>=1.7.0

trove/common/limits.py

@@ -30,7 +30,7 @@ from oslo.utils import importutils
 
 from trove.common import cfg
 from trove.common import wsgi as base_wsgi
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 from trove.openstack.common import wsgi
 from trove.openstack.common.gettextutils import _
 

trove/common/wsgi.py

@@ -30,7 +30,7 @@ from trove.common import context as rd_context
 from trove.common import exception
 from trove.common import utils
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 
 from trove.openstack.common import pastedeploy
 from trove.openstack.common import service

trove/tests/unittests/api/common/test_limits.py

@@ -29,7 +29,7 @@ from trove.common import limits
 from trove.common.limits import Limit
 from trove.limits import views
 from trove.limits.service import LimitsController
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 from trove.quota.quota import QUOTAS
 
 TEST_LIMITS = [