From 72840edc736b7f4d2366b5049f6516d8f5b901ff Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Sun, 3 Jun 2012 18:00:00 +0800 Subject: Add a load function wrapper to jsonutils Fixes bug #1008065 Change-Id: I72aba29eea4637643cb7742f2fd4b1f05d15667f --- openstack/common/jsonutils.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'openstack/common') diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index fa8b8f9..f0a3e6e 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 loads() and dumps(). The dumps() wrapper will + 2) Wrappers around load(), loads() and dumps(). The dumps() wrapper will automatically use to_primitive() for you if needed. - 3) This sets up anyjson to use the loads() and dumps() wrappers if anyjson - is available. + 3) This sets up anyjson to use the load(), loads() and dumps() wrappers + if anyjson is available. ''' @@ -119,6 +119,10 @@ def dumps(value): return json.dumps(value, default=to_primitive) +def load(s): + return json.load(s) + + def loads(s): return json.loads(s) @@ -129,5 +133,6 @@ except ImportError: pass else: anyjson._modules.append((__name__, 'dumps', TypeError, + 'load', ValueError, 'loads', ValueError)) anyjson.force_implementation(__name__) -- cgit