From a350b44b1be03cc7b9d198a736118261b4547d35 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Thu, 21 Feb 2019 14:15:09 +0800 Subject: [PATCH] Update json module to jsonutils oslo project provide jsonutils, and the others project use it now, this PS to update json moudule to oslo jsonutils for consistency. Change-Id: Ifbf7b16e7c81dc0f85b07b77599ab4e404f2cdd4 --- freezer_api/api/common/middleware.py | 4 ++-- freezer_api/api/common/resource.py | 3 +-- freezer_api/api/v1/homedoc.py | 2 +- freezer_api/api/v2/homedoc.py | 2 +- freezer_api/api/versions.py | 2 +- freezer_api/cmd/manage.py | 2 +- freezer_api/tests/unit/test_versions.py | 4 ++-- freezer_api/tests/unit/v1/test_homedoc.py | 4 ++-- freezer_api/tests/unit/v1/test_jobs.py | 3 ++- freezer_api/tests/unit/v2/test_homedoc.py | 4 ++-- freezer_api/tests/unit/v2/test_jobs.py | 3 ++- requirements.txt | 1 + 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/freezer_api/api/common/middleware.py b/freezer_api/api/common/middleware.py index 15707e47..63ebee13 100644 --- a/freezer_api/api/common/middleware.py +++ b/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 diff --git a/freezer_api/api/common/resource.py b/freezer_api/api/common/resource.py index e39322b4..ce9a1249 100644 --- a/freezer_api/api/common/resource.py +++ b/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 diff --git a/freezer_api/api/v1/homedoc.py b/freezer_api/api/v1/homedoc.py index 5c7a15ab..544b0d47 100644 --- a/freezer_api/api/v1/homedoc.py +++ b/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': { diff --git a/freezer_api/api/v2/homedoc.py b/freezer_api/api/v2/homedoc.py index 8b627969..db1ed452 100644 --- a/freezer_api/api/v2/homedoc.py +++ b/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': { diff --git a/freezer_api/api/versions.py b/freezer_api/api/versions.py index 43a1dbcc..412553d5 100644 --- a/freezer_api/api/versions.py +++ b/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 diff --git a/freezer_api/cmd/manage.py b/freezer_api/cmd/manage.py index 54d4fc3b..43791669 100644 --- a/freezer_api/cmd/manage.py +++ b/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 diff --git a/freezer_api/tests/unit/test_versions.py b/freezer_api/tests/unit/test_versions.py index ba61a878..f85da688 100644 --- a/freezer_api/tests/unit/test_versions.py +++ b/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 diff --git a/freezer_api/tests/unit/v1/test_homedoc.py b/freezer_api/tests/unit/v1/test_homedoc.py index a04effc3..3ea24da1 100644 --- a/freezer_api/tests/unit/v1/test_homedoc.py +++ b/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 diff --git a/freezer_api/tests/unit/v1/test_jobs.py b/freezer_api/tests/unit/v1/test_jobs.py index 9fa84348..35678c2d 100644 --- a/freezer_api/tests/unit/v1/test_jobs.py +++ b/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 diff --git a/freezer_api/tests/unit/v2/test_homedoc.py b/freezer_api/tests/unit/v2/test_homedoc.py index dcc0a421..0a2bd6c4 100644 --- a/freezer_api/tests/unit/v2/test_homedoc.py +++ b/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 diff --git a/freezer_api/tests/unit/v2/test_jobs.py b/freezer_api/tests/unit/v2/test_jobs.py index a13407f2..c8b7e285 100644 --- a/freezer_api/tests/unit/v2/test_jobs.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index 3d9337a9..48b3c2dd 100644 --- a/requirements.txt +++ b/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