From 3dce38f32559659978dd2ae69e9ffcb39c608582 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Sun, 3 Jun 2012 16:36:06 +0800 Subject: Replace standard json module with openstack.common.jsonutils Implements blueprint use-common-jsonutils 1. Edit openstack-common.conf and import nova/openstack/common/jsonutils.py 2. Remove json package imports and replace with jsonutils Places where using json.load hasn't changed. Change-Id: Ie6feab605fb0474fd505c56ef57b7a9ecfa5269d --- nova/api/openstack/compute/limits.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py index 09dba0744..c0ef65670 100644 --- a/nova/api/openstack/compute/limits.py +++ b/nova/api/openstack/compute/limits.py @@ -20,7 +20,6 @@ Module dedicated functions/classes dealing with rate limiting requests. import collections import copy import httplib -import json import math import re import time @@ -32,6 +31,7 @@ from nova.api.openstack.compute.views import limits as limits_views from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.openstack.common import importutils +from nova.openstack.common import jsonutils from nova import quota from nova import wsgi as base_wsgi @@ -418,7 +418,7 @@ class WsgiLimiter(object): raise webob.exc.HTTPMethodNotAllowed() try: - info = dict(json.loads(request.body)) + info = dict(jsonutils.loads(request.body)) except ValueError: raise webob.exc.HTTPBadRequest() @@ -449,7 +449,7 @@ class WsgiLimiterProxy(object): self.limiter_address = limiter_address def check_for_delay(self, verb, path, username=None): - body = json.dumps({"verb": verb, "path": path}) + body = jsonutils.dumps({"verb": verb, "path": path}) headers = {"Content-Type": "application/json"} conn = httplib.HTTPConnection(self.limiter_address) -- cgit