diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-05-17 13:48:59 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-05-17 15:39:43 +0200 |
commit | 6c33ef52d422cfe2b924d9e1da16266159b5d3b2 (patch) | |
tree | c7cd6efc9645e4a5992495d6518f97e223f160c0 /bin | |
parent | 45253db95f05baf810c117a555ddec60c0349177 (diff) | |
download | tools-6c33ef52d422cfe2b924d9e1da16266159b5d3b2.tar.gz tools-6c33ef52d422cfe2b924d9e1da16266159b5d3b2.tar.bz2 tools-6c33ef52d422cfe2b924d9e1da16266159b5d3b2.zip |
some code layout
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/hostinfo | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bin/hostinfo b/bin/hostinfo index a1dde4a..8876c54 100755 --- a/bin/hostinfo +++ b/bin/hostinfo @@ -24,23 +24,23 @@ def print_info(path, key=None, oneline=False, verbose=False, nospaces=False): p = printer.Printer(data, oneline, verbose, nospaces) p.info(key) -def _print_keys(data, prefix = ''): - for key in data.keys(): - print "%s%s" % (prefix, key) - - if key == 'addresses': - for k in set([a['interface'] for a in data[key]]): - print "%s%s.%s" % (prefix, key, k) - if key == 'ports': - for k in set([p['process'] for p in data[key] if 'process' in p]): - print "%s%s.%s" % (prefix, key, k) - if len([p for p in data[key] if 'process' not in p]) > 0: - print "%s%s.%s" % (prefix, key, 'UNKNOWN') - - if isinstance(data[key], dict): - _print_keys(data[key], "%s%s." % (prefix, key)) - def print_keys(path): + def _print_keys(data, prefix = ''): + for key in data.keys(): + print "%s%s" % (prefix, key) + + if key == 'addresses': + for k in set([a['interface'] for a in data[key]]): + print "%s%s.%s" % (prefix, key, k) + if key == 'ports': + for k in set([p['process'] for p in data[key] if 'process' in p]): + print "%s%s.%s" % (prefix, key, k) + if len([p for p in data[key] if 'process' not in p]) > 0: + print "%s%s.%s" % (prefix, key, 'UNKNOWN') + + if isinstance(data[key], dict): + _print_keys(data[key], "%s%s." % (prefix, key)) + data = _get_data(path) _print_keys(data) |