diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index a118b271e..8bc3c9d94 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -18,13 +18,13 @@ Common Auth Middleware. """ -import json import webob.dec import webob.exc from nova import context from nova import flags from nova.openstack.common import cfg +from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import wsgi @@ -101,7 +101,7 @@ class NovaKeystoneContext(wsgi.Middleware): if req.headers.get('X_SERVICE_CATALOG') is not None: try: catalog_header = req.headers.get('X_SERVICE_CATALOG') - service_catalog = json.loads(catalog_header) + service_catalog = jsonutils.loads(catalog_header) except ValueError: raise webob.exc.HTTPInternalServerError( _('Invalid service catalog json.')) |