diff options
| author | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-03 16:36:06 +0800 |
|---|---|---|
| committer | Zhongyue Luo <lzyeval@gmail.com> | 2012-06-07 09:24:03 +0800 |
| commit | 3dce38f32559659978dd2ae69e9ffcb39c608582 (patch) | |
| tree | 7735a91c738dbd944344eb4fa3724bc9aa4dcf4b /nova/openstack | |
| parent | 7b7febb02b37420c759eab59b07c7e3e2de9bab1 (diff) | |
| download | nova-3dce38f32559659978dd2ae69e9ffcb39c608582.tar.gz nova-3dce38f32559659978dd2ae69e9ffcb39c608582.tar.xz nova-3dce38f32559659978dd2ae69e9ffcb39c608582.zip | |
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
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/policy.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/openstack/common/policy.py b/nova/openstack/common/policy.py index 203995a3d..9337ec950 100644 --- a/nova/openstack/common/policy.py +++ b/nova/openstack/common/policy.py @@ -17,11 +17,12 @@ """Common Policy Engine Implementation""" -import json import logging import urllib import urllib2 +from nova.openstack.common import jsonutils + LOG = logging.getLogger(__name__) @@ -132,7 +133,7 @@ class Brain(object): @classmethod def load_json(cls, data, default_rule=None): """Init a brain using json instead of a rules dictionary.""" - rules_dict = json.loads(data) + rules_dict = jsonutils.loads(data) return cls(rules=rules_dict, default_rule=default_rule) def __init__(self, rules=None, default_rule=None): @@ -231,8 +232,8 @@ class HttpBrain(Brain): """ url = match % target_dict - data = {'target': json.dumps(target_dict), - 'credentials': json.dumps(cred_dict)} + data = {'target': jsonutils.dumps(target_dict), + 'credentials': jsonutils.dumps(cred_dict)} post_data = urllib.urlencode(data) f = urllib2.urlopen(url, post_data) return f.read() == "True" |