Merge "Update json module to jsonutils"

openstack · Feb 27, 2019 · 4db0f5b · 4db0f5b
2 parents 1afdfc2 + 7358119
commit 4db0f5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/zun/common/utils.py b/zun/common/utils.py
@@ -21,13 +21,13 @@
 import eventlet
 import functools
 import inspect
-import json
 import mimetypes
 
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_context import context as common_context
 from oslo_log import log as logging
+from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import strutils
 import pecan
@@ -369,7 +369,7 @@ def check_capsule_template(tpl):
     tpl_json = tpl
     if isinstance(tpl, six.string_types):
         try:
-            tpl_json = json.loads(tpl)
+            tpl_json = jsonutils.loads(tpl)
         except Exception as e:
             raise exception.FailedParseStringToJson(e)
 

diff --git a/zun/db/sqlalchemy/alembic/versions/3e80bbfd8da7_convert_type_of_command_from_string_to_.py b/zun/db/sqlalchemy/alembic/versions/3e80bbfd8da7_convert_type_of_command_from_string_to_.py
@@ -19,12 +19,13 @@
 
 """
 
-import json
 import shlex
 
 from alembic import op
 import sqlalchemy as sa
 
+from oslo_serialization import jsonutils
+
 
 # revision identifiers, used by Alembic.
 revision = '3e80bbfd8da7'
@@ -47,7 +48,7 @@ def upgrade():
         for row in session.query(TABLE_MODEL):
             if row[1]:
                 command = shlex.split(row[1])
-                command = json.dumps(command)
+                command = jsonutils.dumps(command)
                 session.execute(
                     TABLE_MODEL.update().values(
                         command=command).where(