Merge "Switch common files to using jsonutils."

7 files changed, 20 insertions, 19 deletions

diff --git a/openstack/common/log.py b/openstack/common/log.py
index 9d8bddf..348f3ab 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -32,7 +32,6 @@ It also allows setting of formatting information through conf.
 import cStringIO
 import inspect
 import itertools
-import json
 import logging
 import logging.config
 import logging.handlers
@@ -42,6 +41,7 @@ import sys
 import traceback
 
 from openstack.common import cfg
+from openstack.common import jsonutils
 from openstack.common import local
 from openstack.common import notifier
 
@@ -241,7 +241,7 @@ class JSONFormatter(logging.Formatter):
         if record.exc_info:
             message['traceback'] = self.formatException(record.exc_info)
 
-        return json.dumps(message)
+        return jsonutils.dumps(message)
 
 
 class PublishErrorsHandler(logging.Handler):
diff --git a/openstack/common/notifier/log_notifier.py b/openstack/common/notifier/log_notifier.py
index 594fd3e..3b025f0 100644
--- a/openstack/common/notifier/log_notifier.py
+++ b/openstack/common/notifier/log_notifier.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 
 from openstack.common import cfg
+from openstack.common import jsonutils
 from openstack.common import log as logging
 
 
@@ -31,4 +31,4 @@ def notify(_context, message):
     priority = priority.lower()
     logger = logging.getLogger(
             'openstack.common.notification.%s' % message['event_type'])
-    getattr(logger, priority)(json.dumps(message))
+    getattr(logger, priority)(jsonutils.dumps(message))
diff --git a/openstack/common/policy.py b/openstack/common/policy.py
index 203995a..52cfa2b 100644
--- a/openstack/common/policy.py
+++ b/openstack/common/policy.py
@@ -17,11 +17,12 @@
 
 """Common Policy Engine Implementation"""
 
-import json
 import logging
 import urllib
 import urllib2
 
+from openstack.common import jsonutils
+
 
 LOG = logging.getLogger(__name__)
 
@@ -132,7 +133,7 @@ class Brain(object):
     @classmethod
     def load_json(cls, data, default_rule=None):
         """Init a brain using json instead of a rules dictionary."""
-        rules_dict = json.loads(data)
+        rules_dict = jsonutils.loads(data)
         return cls(rules=rules_dict, default_rule=default_rule)
 
     def __init__(self, rules=None, default_rule=None):
@@ -231,8 +232,8 @@ class HttpBrain(Brain):
 
         """
         url = match % target_dict
-        data = {'target': json.dumps(target_dict),
-                'credentials': json.dumps(cred_dict)}
+        data = {'target': jsonutils.dumps(target_dict),
+                'credentials': jsonutils.dumps(cred_dict)}
         post_data = urllib.urlencode(data)
         f = urllib2.urlopen(url, post_data)
         return f.read() == "True"
diff --git a/openstack/common/rpc/impl_fake.py b/openstack/common/rpc/impl_fake.py
index fba20c9..ff16208 100644
--- a/openstack/common/rpc/impl_fake.py
+++ b/openstack/common/rpc/impl_fake.py
@@ -18,11 +18,11 @@ queues.  Casts will block, but this is very useful for tests.
 """
 
 import inspect
-import json
 import time
 
 import eventlet
 
+from openstack.common import jsonutils
 from openstack.common.rpc import common as rpc_common
 
 CONSUMERS = {}
@@ -121,7 +121,7 @@ def create_connection(conf, new=True):
 
 def check_serialize(msg):
     """Make sure a message intended for rpc can be serialized."""
-    json.dumps(msg)
+    jsonutils.dumps(msg)
 
 
 def multicall(conf, context, topic, msg, timeout=None):
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py
index d01bf0d..677b54b 100644
--- a/openstack/common/rpc/impl_qpid.py
+++ b/openstack/common/rpc/impl_qpid.py
@@ -17,7 +17,6 @@
 
 import functools
 import itertools
-import json
 import logging
 import time
 import uuid
@@ -29,6 +28,7 @@ import qpid.messaging.exceptions
 
 from openstack.common import cfg
 from openstack.common.gettextutils import _
+from openstack.common import jsonutils
 from openstack.common.rpc import amqp as rpc_amqp
 from openstack.common.rpc import common as rpc_common
 
@@ -125,7 +125,7 @@ class ConsumerBase(object):
         addr_opts["node"]["x-declare"].update(node_opts)
         addr_opts["link"]["x-declare"].update(link_opts)
 
-        self.address = "%s ; %s" % (node_name, json.dumps(addr_opts))
+        self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
 
         self.reconnect(session)
 
@@ -230,7 +230,7 @@ class Publisher(object):
         if node_opts:
             addr_opts["node"]["x-declare"].update(node_opts)
 
-        self.address = "%s ; %s" % (node_name, json.dumps(addr_opts))
+        self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
 
         self.reconnect(session)
 
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index 6bb9aa9..3eefa96 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import pprint
 import string
 import sys
@@ -28,6 +27,7 @@ import greenlet
 from openstack.common import cfg
 from openstack.common.gettextutils import _
 from openstack.common import importutils
+from openstack.common import jsonutils
 from openstack.common.rpc import common as rpc_common
 
 
@@ -76,7 +76,7 @@ def _serialize(data):
     Error if a developer passes us bad data.
     """
     try:
-        return str(json.dumps(data, ensure_ascii=True))
+        return str(jsonutils.dumps(data, ensure_ascii=True))
     except TypeError:
         LOG.error(_("JSON serialization failed."))
         raise
@@ -87,7 +87,7 @@ def _deserialize(data):
     Deserialization wrapper
     """
     LOG.debug(_("Deserializing: %s"), data)
-    return json.loads(data)
+    return jsonutils.loads(data)
 
 
 class ZmqSocket(object):
diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py
index c08e4d7..416fe09 100644
--- a/openstack/common/wsgi.py
+++ b/openstack/common/wsgi.py
@@ -23,7 +23,6 @@ import eventlet.wsgi
 
 eventlet.patcher.monkey_patch(all=False, socket=True)
 
-import json
 import logging
 import sys
 import routes
@@ -34,6 +33,7 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from openstack.common import exception
+from openstack.common import jsonutils
 
 
 LOG = logging.getLogger('wsgi')
@@ -372,7 +372,7 @@ class JSONDictSerializer(DictSerializer):
                 _dtime = obj - datetime.timedelta(microseconds=obj.microsecond)
                 return _dtime.isoformat()
             return obj
-        return json.dumps(data, default=sanitizer)
+        return jsonutils.dumps(data, default=sanitizer)
 
 
 class XMLDictSerializer(DictSerializer):
@@ -641,7 +641,7 @@ class JSONDeserializer(TextDeserializer):
 
     def _from_json(self, datastring):
         try:
-            return json.loads(datastring)
+            return jsonutils.loads(datastring)
         except ValueError:
             msg = _("cannot understand JSON")
             raise exception.MalformedRequestBody(reason=msg)