summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2014-04-30 17:25:59 +0200
committerIhar Hrachyshka <ihrachys@redhat.com>2014-04-30 17:25:59 +0200
commit756b3935ac77291b9195a23bc829c88ef67ab0ae (patch)
tree00a5256658231d209d105bb80d1d8ea84829f208
parent596487e5bca4fcd23230527e55e07a2d20a87347 (diff)
downloadoslo-serialization-756b3935ac77291b9195a23bc829c88ef67ab0ae.tar.gz
jsonutils.load() accepts file pointer, not string
Renamed jsonutils.load() argument name to more appropriate one. This name is also used in stdlib json documentation [1]. 1: https://docs.python.org/2/library/json.html#json.load Change-Id: Ia0cfce0e023ce29d3aad80a71039343643820bb4
-rw-r--r--openstack/common/jsonutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py
index 86b2987..f00a801 100644
--- a/openstack/common/jsonutils.py
+++ b/openstack/common/jsonutils.py
@@ -170,8 +170,8 @@ def loads(s):
return json.loads(s)
-def load(s):
- return json.load(s)
+def load(fp):
+ return json.load(fp)
try: