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 /bin | |
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 'bin')
-rwxr-xr-x | bin/nova-manage | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 605e76032..ce8a6d794 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -57,7 +57,6 @@ import ast import errno import gettext -import json import math import netaddr import optparse @@ -90,6 +89,7 @@ from nova import flags from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import importutils +from nova.openstack.common import jsonutils from nova import quota from nova import rpc from nova.scheduler import rpcapi as scheduler_rpcapi @@ -1536,7 +1536,7 @@ class ExportCommands(object): def auth(self): """Export Nova auth data in format that can be consumed by Keystone""" - print json.dumps(self._get_auth_data()) + print jsonutils.dumps(self._get_auth_data()) def _get_auth_data(self): output = { |