Changeset 201 for etherws

Timestamp:

08/01/12 11:38:43 (12 years ago)

Author:

atzm

Message:

• fixed a bug, raise exception when result is empty

File:

• etherws/trunk/etherws.py (modified) (2 diffs)

etherws/trunk/etherws.py

@@ -767 +767 @@
 
     def maxlen(dict_, key, min_):
+        if not dict_:
+            return min_
         max_ = max(len(str(r[key])) for r in dict_)
         return min_ if max_ < min_ else max_
@@ -834 +836 @@
             return
         result = result['result']['entries']
+        pmax = maxlen(result, 'port', 4)
         vmax = maxlen(result, 'vid', 4)
         mmax = maxlen(result, 'mac', 3)
-        pmax = maxlen(result, 'port', 4)
         amax = maxlen(result, 'age', 3)
-        fmt = '  %%%ds  %%%ds  %%%ds  %%%ds' % (vmax, mmax, pmax, amax)
-        print(fmt % ('VLAN', 'MAC', 'Port', 'Age'))
+        fmt = '  %%%ds  %%%ds  %%-%ds  %%%ds' % (pmax, vmax, mmax, amax)
+        print(fmt % ('Port', 'VLAN', 'MAC', 'Age'))
         for r in result:
-            print(fmt % (r['vid'], r['mac'], r['port'], r['age']))
+            print(fmt % (r['port'], r['vid'], r['mac'], r['age']))
 
     locals()['handle_ctl_' + args.control_method](args)