Commit dbe38bec authored by Faidon Liambotis's avatar Faidon Liambotis
Browse files

Actually fix simplejson wrt util/rapi.py

Broken by previous commit, 3481786
parent 85b0e12a
......@@ -245,7 +245,7 @@ class GanetiRapiClient(object): # pylint: disable-msg=R0904
"""
USER_AGENT = "Ganeti RAPI Client"
_json_encoder = simplejson.JSONEncoder(sort_keys=True)
_json_encoder = json.JSONEncoder(sort_keys=True)
def __init__(self, host, port=GANETI_RAPI_PORT,
username=None, password=None, logger=logging,
......@@ -422,7 +422,7 @@ class GanetiRapiClient(object): # pylint: disable-msg=R0904
# Was anything written to the response buffer?
if encoded_resp_body.tell():
response_content = simplejson.loads(encoded_resp_body.getvalue())
response_content = json.loads(encoded_resp_body.getvalue())
else:
response_content = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment