diff options
Diffstat (limited to 'hostinfo/printer.py')
| -rw-r--r-- | hostinfo/printer.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hostinfo/printer.py b/hostinfo/printer.py index 9d05431..426821c 100644 --- a/hostinfo/printer.py +++ b/hostinfo/printer.py @@ -29,10 +29,11 @@ class Printer: ignore = ['vserver-host', 'groups'] - def __init__(self, data, oneline, verbose): + def __init__(self, data, oneline, verbose, nospaces): self.data = data self.oneline = oneline self.verbose = verbose + self.nospaces = nospaces def _sort_with_list(self, list, sort): def helper(value): @@ -95,6 +96,8 @@ class Printer: sort) maxlength = max(map(len, map(lambda (key, full_key): self._get_label(key, full_key), keys))) + if not self.nospaces and filter_key is None and prefix == '': + pprint() for (key, full_key) in keys: if filter_key is None or filter_key.startswith(full_key): new_filter_key = filter_key @@ -105,7 +108,10 @@ class Printer: if filter_key is None: label = "%s: " % self._get_label(key, full_key) if prefix == '': - label = label.rjust(maxlength+4) + if self.nospaces: + label = label.rjust(maxlength+4) + else: + label = (label + " ").rjust(maxlength+6) else: label = label.ljust(maxlength+2) @@ -118,6 +124,9 @@ class Printer: except AttributeError: self._print(value[key], new_pprint, full_key, new_filter_key) + if not self.nospaces and filter_key is None and prefix == '': + pprint() + def _print_group_by(self, value, pprint, prefix, filter_key, group, format, sort=None): d = {} for e in value: |