Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
ceb3fc4835
1 changed files with 4 additions and 2 deletions
|
|
@ -837,14 +837,16 @@ def generate_global_vars_report():
|
||||||
if k == 'Env':
|
if k == 'Env':
|
||||||
continue
|
continue
|
||||||
if isinstance(v, list):
|
if isinstance(v, list):
|
||||||
report.append(' {}:'.format(str(k)))
|
report.append(' {}: ['.format(str(k)))
|
||||||
for item in v:
|
for item in v:
|
||||||
report.append(' {}'.format(str(v)))
|
report.append(' {}'.format(str(v)))
|
||||||
|
report.append(' ]')
|
||||||
elif isinstance(v, dict):
|
elif isinstance(v, dict):
|
||||||
report.append(' {}:'.format(str(k)))
|
report.append(' {}: {{'.format(str(k)))
|
||||||
for item_k, item_v in sorted(v.items()):
|
for item_k, item_v in sorted(v.items()):
|
||||||
report.append(' {:<15} {}'.format(
|
report.append(' {:<15} {}'.format(
|
||||||
str(item_k)+':', str(item_v)))
|
str(item_k)+':', str(item_v)))
|
||||||
|
report.append(' }')
|
||||||
else:
|
else:
|
||||||
report.append(' {:<18}{}'.format(str(k)+':', str(v)))
|
report.append(' {:<18}{}'.format(str(k)+':', str(v)))
|
||||||
report.append(' Env:')
|
report.append(' Env:')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue