diff options
| author | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-04-30 17:25:59 +0200 |
|---|---|---|
| committer | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-08-05 16:31:40 +0200 |
| commit | f1cb775ede0fef8bc5268612e53bbaa0e6eae3d5 (patch) | |
| tree | aa068b1537c1c991886c28aacfdb0a95a24e7039 | |
| parent | d97bd2a564cb06c613678407fd074985be73f4d5 (diff) | |
| download | oslo-incubator-f1cb775ede0fef8bc5268612e53bbaa0e6eae3d5.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
(cherry picked from commit 9e5a39389c866d3e0901edc618e7cd364a49dbce)
| -rw-r--r-- | openstack/common/jsonutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/jsonutils.py b/openstack/common/jsonutils.py index 100a10e9..26d1eb76 100644 --- a/openstack/common/jsonutils.py +++ b/openstack/common/jsonutils.py @@ -166,8 +166,8 @@ def loads(s): return json.loads(s) -def load(s): - return json.load(s) +def load(fp): + return json.load(fp) try: |