openstack
/
oslo.serialization
Code Issues Proposed changes

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
This commit is contained in:
Russell Bryant 2012-06-05 13:36:25 -04:00
parent 35a991e279
commit cfd8bc5f84
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack/common/jsonutils.py
View File

@ -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__)