Merge "Update json module to jsonutils"

freezerclient/exceptions.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
+from oslo_serialization import jsonutils as json
 
 
 class ApiClientException(Exception):

freezerclient/tests/unit/v1/test_client_jobs.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import unittest
 
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient.v1.managers import jobs
 

freezerclient/tests/unit/v1/test_client_sessions.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import unittest
 
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient.v1.managers import sessions
 

freezerclient/tests/unit/v2/test_client_jobs.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import unittest
 
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient.v2.managers import jobs
 

freezerclient/tests/unit/v2/test_client_sessions.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import unittest
 
 import mock
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient.v2.managers import sessions
 

freezerclient/utils.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 
-import json
 import logging
 import os
 
+from oslo_serialization import jsonutils as json
 from oslo_utils import importutils
 
 logging = logging.getLogger(__name__)

freezerclient/v1/managers/actions.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v1/managers/backups.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v1/managers/clients.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v1/managers/jobs.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v1/managers/sessions.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v2/managers/actions.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v2/managers/backups.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v2/managers/clients.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v2/managers/jobs.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

freezerclient/v2/managers/sessions.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import requests
 
+from oslo_serialization import jsonutils as json
+
 from freezerclient import exceptions
 from freezerclient import utils
 

lower-constraints.txt

@@ -25,6 +25,7 @@ netaddr==0.7.18
 netifaces==0.10.4
 openstackdocstheme==1.18.1
 oslo.i18n==3.15.3
+oslo.serialization==2.25.0
 oslo.utils==3.33.0
 pbr==2.0.0
 pep8==1.7.1

requirements.txt

@@ -5,4 +5,5 @@ setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
 cliff!=2.9.0,>=2.8.0 # Apache-2.0
+oslo.serialization>=2.25.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0