From 97478dbd48e343300cc71f3d5aae00843456d796 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 23 Jul 2012 17:06:54 -0400 Subject: Update NovaKeystoneContext to use jsonutils. Minor fix to use jsonutils.loads instead of json.loads to standardize w/ the rest of Nova. Change-Id: I4a6912d29fbe425b29bd1b170b9bec19e3bfc46e --- nova/api/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/api') 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.')) -- cgit