xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 11:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix inconsistent dict member extension

Browse Source 
If two portions of a list come back piecewise from the plugin that
are both lists, extend them rather than making a nested list.
This commit is contained in:
Jarrod Johnson 2018-03-15 12:09:45 -04:00
parent a20b0abb43
commit 308db99dbb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/httpapi.py
View File

@ -741,7 +741,10 @@ def _assemble_json(responses, resource=None, url=None, extension=None):
for dk in rsp.iterkeys():
if dk in rspdata:
if isinstance(rspdata[dk], list):
rspdata[dk].append(rsp[dk])
if isinstance(rsp[dk], list):
rspdata[dk].extend(rsp[dk])
else:
rspdata[dk].append(rsp[dk])
else:
rspdata[dk] = [rspdata[dk], rsp[dk]]
else: