Merge "Do not display None in pretty tables for fields with no value"

This commit is contained in:
Jenkins
2012-06-29 15:38:37 +00:00
committed by Gerrit Code Review

View File

@@ -31,6 +31,8 @@ def print_list(objs, fields, formatters={}):
else: else:
field_name = field.lower().replace(' ', '_') field_name = field.lower().replace(' ', '_')
data = getattr(o, field_name, '') data = getattr(o, field_name, '')
if data is None:
data = ''
row.append(data) row.append(data)
pt.add_row(row) pt.add_row(row)
@@ -40,7 +42,10 @@ def print_list(objs, fields, formatters={}):
def print_dict(d): def print_dict(d):
pt = prettytable.PrettyTable(['Property', 'Value'], caching=False) pt = prettytable.PrettyTable(['Property', 'Value'], caching=False)
pt.aligns = ['l', 'l'] pt.aligns = ['l', 'l']
[pt.add_row(list(r)) for r in d.iteritems()] for (prop, value) in d.iteritems():
if value is None:
value = ''
pt.add_row((prop, value))
print pt.get_string(sortby='Property') print pt.get_string(sortby='Property')