Listing fix

This commit is contained in:
Kload 2013-03-15 18:12:48 +00:00
parent 57c15cda02
commit 434d70d011
2 changed files with 4 additions and 2 deletions

View file

@ -52,9 +52,11 @@ def pretty_print_dict(d, depth=0):
pretty_print_dict(v, depth+1) pretty_print_dict(v, depth+1)
elif isinstance(v, list): elif isinstance(v, list):
print((" ") * depth + ("%s: " % str(k))) print((" ") * depth + ("%s: " % str(k)))
for value in v: for key, value in enumerate(v):
if isinstance(value, tuple): if isinstance(value, tuple):
pretty_print_dict({value[0]: value[1]}, depth+1) pretty_print_dict({value[0]: value[1]}, depth+1)
elif isinstance(value, dict):
pretty_print_dict({key: value}, depth+1)
else: else:
print((" ") * (depth+1) + "- " +str(value)) print((" ") * (depth+1) + "- " +str(value))
else: else:

View file

@ -57,7 +57,7 @@ def user_list(fields=None, filter=None, limit=None, offset=None):
if 'mailalias' in user: if 'mailalias' in user:
entry['Mail Aliases'] = user['mailalias'] entry['Mail Aliases'] = user['mailalias']
result_list.append((str(i), entry)) result_list.append(entry)
i += 1 i += 1
else: else:
raise YunoHostError(167, _("No user found")) raise YunoHostError(167, _("No user found"))