Code Review
/
yardstick.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
8fc6288
)
Merge "Bugfix: don't use jsonutils.load, use loads()"
author
Rex Lee
<limingjiang@huawei.com>
Thu, 9 Mar 2017 01:26:35 +0000
(
01:26
+0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Thu, 9 Mar 2017 01:26:35 +0000
(
01:26
+0000)
yardstick/common/utils.py
patch
|
blob
|
history
diff --git
a/yardstick/common/utils.py
b/yardstick/common/utils.py
index
e53f4b4
..
d2be800
100644
(file)
--- a/
yardstick/common/utils.py
+++ b/
yardstick/common/utils.py
@@
-134,7
+134,9
@@
def source_env(env_file):
def read_json_from_file(path):
with open(path, 'r') as f:
- return jsonutils.load(f)
+ j = f.read()
+ # don't use jsonutils.load() it conflicts with already decoded input
+ return jsonutils.loads(j)
def write_json_to_file(path, data, mode='w'):