diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 22:38:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 22:38:13 +0000 |
| commit | 943997e9f1d4ec609532a13712561ee817029b81 (patch) | |
| tree | 31dc05fd7cd53899ee4692aca2cfc6ec583a817a /openstack | |
| parent | d10eaf22ebf17635f9408c3627c874aff7f0f860 (diff) | |
| parent | 4c9d439ef24f5afdd74aa9153aa8fc772051e6cb (diff) | |
| download | oslo-943997e9f1d4ec609532a13712561ee817029b81.tar.gz oslo-943997e9f1d4ec609532a13712561ee817029b81.tar.xz oslo-943997e9f1d4ec609532a13712561ee817029b81.zip | |
Merge "Add 'filedecoder' method to the jsonutils wrapper module."
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/jsonutils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index 7522669..11b7e1e 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -130,11 +130,15 @@ def loads(s): return json.loads(s) +def load(s): + return json.load(s) + + try: import anyjson except ImportError: pass else: anyjson._modules.append((__name__, 'dumps', TypeError, - 'loads', ValueError)) + 'loads', ValueError, 'load')) anyjson.force_implementation(__name__) |