Revision 1f6ba360 util/rapi.py
b/util/rapi.py | ||
---|---|---|
245 | 245 |
|
246 | 246 |
""" |
247 | 247 |
USER_AGENT = "Ganeti RAPI Client" |
248 |
_json_encoder = simplejson.JSONEncoder(sort_keys=True)
|
|
248 |
_json_encoder = json.JSONEncoder(sort_keys=True) |
|
249 | 249 |
|
250 | 250 |
def __init__(self, host, port=GANETI_RAPI_PORT, |
251 | 251 |
username=None, password=None, logger=logging, |
... | ... | |
422 | 422 |
|
423 | 423 |
# Was anything written to the response buffer? |
424 | 424 |
if encoded_resp_body.tell(): |
425 |
response_content = simplejson.loads(encoded_resp_body.getvalue())
|
|
425 |
response_content = json.loads(encoded_resp_body.getvalue()) |
|
426 | 426 |
else: |
427 | 427 |
response_content = None |
428 | 428 |
|
Also available in: Unified diff