summaryrefslogtreecommitdiffstats
path: root/openstack/common/jsonutils.py
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2012-06-05 13:36:25 -0400
committerRussell Bryant <rbryant@redhat.com>2012-06-06 10:29:26 -0400
commitbdc4fb3183d455f00870981f5b9a200cc1b8b3f1 (patch)
treeaa93d3cc48b26e38921a7b21e3547ebe33d27dcf /openstack/common/jsonutils.py
parentfcfe81e600b4dc1f06498bab93c1f1244e943699 (diff)
downloadoslo-bdc4fb3183d455f00870981f5b9a200cc1b8b3f1.tar.gz
oslo-bdc4fb3183d455f00870981f5b9a200cc1b8b3f1.tar.xz
oslo-bdc4fb3183d455f00870981f5b9a200cc1b8b3f1.zip
Revert "Add a load function wrapper to jsonutils"
This reverts commit 72840edc736b7f4d2366b5049f6516d8f5b901ff. This change breaks kombu, so revert it since there is no specific need for it. Fixes bug 1009127. Change-Id: Id0ef8b3948b63d0151289cb7ce8e617d9816bb4b
Diffstat (limited to 'openstack/common/jsonutils.py')
-rw-r--r--openstack/common/jsonutils.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py
index f0a3e6e..fa8b8f9 100644
--- a/openstack/common/jsonutils.py
+++ b/openstack/common/jsonutils.py
@@ -25,11 +25,11 @@ This module provides a few things:
1) A handy function for getting an object down to something that can be
JSON serialized. See to_primitive().
- 2) Wrappers around load(), loads() and dumps(). The dumps() wrapper will
+ 2) Wrappers around loads() and dumps(). The dumps() wrapper will
automatically use to_primitive() for you if needed.
- 3) This sets up anyjson to use the load(), loads() and dumps() wrappers
- if anyjson is available.
+ 3) This sets up anyjson to use the loads() and dumps() wrappers if anyjson
+ is available.
'''
@@ -119,10 +119,6 @@ def dumps(value):
return json.dumps(value, default=to_primitive)
-def load(s):
- return json.load(s)
-
-
def loads(s):
return json.loads(s)
@@ -133,6 +129,5 @@ except ImportError:
pass
else:
anyjson._modules.append((__name__, 'dumps', TypeError,
- 'load', ValueError,
'loads', ValueError))
anyjson.force_implementation(__name__)