Merge "Update json module to jsonutils"

freezer_api/api/common/middleware.py

@@ -15,13 +15,13 @@ limitations under the License.
 
 """
 
-import json
-
 import falcon
 from oslo_log import log
 import webob.dec
 import webob.exc
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api import context
 

freezer_api/api/common/resource.py

@@ -16,9 +16,8 @@ Base resource with utility functions
 
 """
 
-import json
-
 import falcon
+from oslo_serialization import jsonutils as json
 
 from freezer_api.common import exceptions as freezer_api_exc
 

freezer_api/api/v1/homedoc.py

@@ -16,7 +16,7 @@ limitations under the License.
 http://tools.ietf.org/html/draft-nottingham-json-home-03
 """
 
-import json
+from oslo_serialization import jsonutils as json
 
 HOME_DOC = {
     'resources': {

freezer_api/api/v2/homedoc.py

@@ -16,7 +16,7 @@ limitations under the License.
 http://tools.ietf.org/html/draft-nottingham-json-home-03
 """
 
-import json
+from oslo_serialization import jsonutils as json
 
 HOME_DOC = {
     'resources': {

freezer_api/api/versions.py

@@ -16,9 +16,9 @@ limitations under the License.
 """
 
 import falcon
-import json
 from oslo_config import cfg
 from oslo_log import log
+from oslo_serialization import jsonutils as json
 
 
 from freezer_api.api.common import middleware

freezer_api/cmd/manage.py

@@ -15,11 +15,11 @@ limitations under the License.
 
 """
 from __future__ import print_function
-import json
 import sys
 
 from oslo_config import cfg
 from oslo_log import log
+from oslo_serialization import jsonutils as json
 
 from freezer_api import __version__ as FREEZER_API_VERSION
 from freezer_api.common import config

freezer_api/tests/unit/test_versions.py

@@ -16,11 +16,11 @@ limitations under the License.
 
 """
 
-import json
-
 import falcon
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.api import v2
 from freezer_api.api import versions
 from freezer_api.tests.unit import common

freezer_api/tests/unit/v1/test_homedoc.py

@@ -16,10 +16,10 @@ limitations under the License.
 
 """
 
-import json
-
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.api import v1
 from freezer_api.tests.unit import common
 

freezer_api/tests/unit/v1/test_jobs.py

@@ -16,13 +16,14 @@ limitations under the License.
 
 """
 
-import json
 import random
 
 import falcon
 import mock
 from mock import patch
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.api.v1 import jobs as v1_jobs
 from freezer_api.common import exceptions
 from freezer_api.tests.unit import common

freezer_api/tests/unit/v2/test_homedoc.py

@@ -17,10 +17,10 @@ limitations under the License.
 
 """
 
-import json
-
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.api import v2
 from freezer_api.tests.unit import common
 

freezer_api/tests/unit/v2/test_jobs.py

@@ -16,13 +16,14 @@ limitations under the License.
 
 """
 
-import json
 import random
 
 import falcon
 import mock
 from mock import patch
 
+from oslo_serialization import jsonutils as json
+
 from freezer_api.api.v2 import jobs as v2_jobs
 from freezer_api.common import exceptions
 from freezer_api.tests.unit import common

requirements.txt

@@ -14,5 +14,6 @@ oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.middleware>=3.31.0 # Apache-2.0
 oslo.policy>=1.30.0 # Apache-2.0
+oslo.serialization>=2.25.0 # Apache-2.0
 oslo.upgradecheck>=0.1.0 # Apache-2.0
 six>=1.10.0 # MIT