diff options
| author | Andy Smith <code@term.ie> | 2010-12-22 17:53:42 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2010-12-22 17:53:42 -0800 |
| commit | 70d254c626e925f6de8408f0ca70f3de28a7307a (patch) | |
| tree | 5a267ea9fc448ae3f369ace9348c1a1d7174988f /nova/wsgi.py | |
| parent | 43e9f8727af618fc3e50308cba95b27c67ee83c5 (diff) | |
| download | nova-70d254c626e925f6de8408f0ca70f3de28a7307a.tar.gz nova-70d254c626e925f6de8408f0ca70f3de28a7307a.tar.xz nova-70d254c626e925f6de8408f0ca70f3de28a7307a.zip | |
added tests to ensure the easy api works as a backend for Compute API
Diffstat (limited to 'nova/wsgi.py')
| -rw-r--r-- | nova/wsgi.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py index 2ad27dd7e..c40f043f9 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -21,7 +21,6 @@ Utility methods for working with WSGI servers """ -import json import logging import sys from xml.dom import minidom @@ -35,6 +34,7 @@ import webob import webob.dec import webob.exc +from nova import utils logging.getLogger("routes.middleware").addHandler(logging.StreamHandler()) @@ -322,7 +322,7 @@ class Serializer(object): try: is_xml = (datastring[0] == '<') if not is_xml: - return json.loads(datastring) + return utils.loads(datastring) return self._from_xml(datastring) except: return None @@ -355,7 +355,7 @@ class Serializer(object): return result def _to_json(self, data): - return json.dumps(data) + return utils.dumps(data) def _to_xml(self, data): metadata = self.metadata.get('application/xml', {}) |