Revision 6add54fd kamaki/utils.py

b/kamaki/utils.py
33 33

  
34 34
def print_dict(d, exclude=(), ident= 0):
35 35
    margin = max(max(len(key) for key in d) + 1, ident)
36
    for key, val in sorted(d.items()):
36
    for key, val in d.items():
37 37
        if key in exclude:
38 38
            continue
39 39
        print_str = '%s:' % unicode(key)
40 40
        if isinstance(val, dict):
41 41
            print(print_str.rjust(margin)+' {')
42
            print_dict(val, exclude = exclude, ident = margin + 8)
42
            print_dict(val, exclude = exclude, ident = margin + 6)
43 43
            print '}'.rjust(margin)
44 44
        elif isinstance(val, list):
45 45
            print(print_str.rjust(margin)+' [')
46
            print_list(val, exclude = exclude, ident = margin + 8)
46
            print_list(val, exclude = exclude, ident = margin + 6)
47 47
            print ']'.rjust(margin)
48 48
        else:
49
            print print_str.rjust(margin+4)+' '+unicode(val)
49
            print print_str.rjust(margin)+' '+unicode(val)
50 50

  
51 51
def print_list(l, exclude=(), ident = 0):
52 52
    margin = max(max(len(item) for item in l) + 1, ident)
53
    for item in sorted(l):
53
    for item in l:
54 54
        if item in exclude:
55 55
            continue
56 56
        if isinstance(item, dict):
57 57
            print('{'.rjust(margin))
58
            print_dict(item, exclude = exclude, ident = margin + 8)
58
            print_dict(item, exclude = exclude, ident = margin + 6)
59 59
            print '}'.rjust(margin)
60 60
        elif isinstance(item, list):
61 61
            print '['.rjust(margin)
62
            print_list(item, exclude = exclude, ident = margin + 8)
62
            print_list(item, exclude = exclude, ident = margin + 6)
63 63
            print ']'.rjust(margin)
64 64
        else:
65
            print unicode(val).rjust(margin + 4)
65
            print unicode(val).rjust(margin)
66 66

  
67 67
def print_items(items, title=('id', 'name')):
68 68
    for item in items:

Also available in: Unified diff