some code layout

2 files changed, 22 insertions, 22 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)
 
diff --git a/hostinfo/printer.py b/hostinfo/printer.py
index 426821c..3eac182 100644
--- a/hostinfo/printer.py
+++ b/hostinfo/printer.py
@@ -52,12 +52,6 @@ class Printer:
                              lambda ip: 'vserver' not in ip and ip['interface'] or None,
                              lambda ip: '%s/%s' % (ip['address'], ip['netmask']))
 
-    def print_vserver(self, value, pprint, prefix, filter_key):
-        if value == 'guest':
-            pprint('guest running on %s' % self.data['vserver-host'])
-        else:
-            pprint(value)
-
     def print_ports(self, value, pprint, prefix, filter_key):
         def _print_port(port):
             if port['proto'] in ['tcp6', 'udp6']:
@@ -70,6 +64,12 @@ class Printer:
                              _print_port,
                              sort=['sshd', 'nrpe', 'munin-node'])
 
+    def print_vserver(self, value, pprint, prefix, filter_key):
+        if value == 'guest':
+            pprint('guest running on %s' % self.data['vserver-host'])
+        else:
+            pprint(value)
+
     def _print(self, value, pprint, prefix='', filter_key=None, sort=None):
         try:
             value = value.strip().splitlines()