diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-07 12:28:26 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-28 06:04:53 +0800 |
| commit | cb747079d037c163349bd09814690682ae22a302 (patch) | |
| tree | 9c92ac38f6ad3824e781b8ac9d259c57002711a4 /keystone/common/wsgi.py | |
| parent | 23ca656927947dada40591bdd1badd5a531c2983 (diff) | |
| download | keystone-cb747079d037c163349bd09814690682ae22a302.tar.gz keystone-cb747079d037c163349bd09814690682ae22a302.tar.xz keystone-cb747079d037c163349bd09814690682ae22a302.zip | |
Keystone should use openstack.common.jsonutils
Implements blueprint use-common-jsonutils
1. Edit openstack-common.conf and import keystone/openstack/common/jsonutils.py
2. Remove json package imports and replace with jsonutils
Client code in vendor/ hasn't been changed
Change-Id: I57c670fde9f2c2241eddab1b012e8d5e6a72deb7
Diffstat (limited to 'keystone/common/wsgi.py')
| -rw-r--r-- | keystone/common/wsgi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 4aaf682d..e2606c53 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -20,7 +20,6 @@ """Utility methods for working with WSGI servers.""" -import json import sys import eventlet.wsgi @@ -33,6 +32,7 @@ import webob.exc from keystone.common import logging from keystone.common import utils from keystone import exception +from keystone.openstack.common import jsonutils LOG = logging.getLogger(__name__) @@ -499,7 +499,7 @@ def render_response(body=None, status=(200, 'OK'), headers=None): ('Vary', 'X-Auth-Token')] if body is not None: - resp.body = json.dumps(body, cls=utils.SmarterEncoder) + resp.body = jsonutils.dumps(body, cls=utils.SmarterEncoder) return resp |