Add custom TableFormater for keep same empty list behavior as prettytable 0.6

soulxu · soulxu · commit e901c5fe8071 · 2013-04-08T17:14:49.000+08:00
Fix bug 1165962

And upgrade cliff to 1.3.2, because cliff 1.3.1 depends on prettytable&lt;0.7

Change-Id: I6b38a2d77f6b9bf88d6d64f6c02b98b6c21fda3a
diff --git a/quantumclient/quantum/v2_0/__init__.py b/quantumclient/quantum/v2_0/__init__.py
@@ -19,6 +19,7 @@
 import logging
 import re
 
+from cliff.formatters import table
 from cliff import lister
 from cliff import show
 
@@ -252,12 +253,30 @@ def update_dict(obj, dict, attributes):
             dict[attribute] = getattr(obj, attribute)
 
 
+class TableFormater(table.TableFormatter):
+    """This class is used to keep consistency with prettytable 0.6.
+
+    https://bugs.launchpad.net/python-quantumclient/+bug/1165962
+    """
+    def emit_list(self, column_names, data, stdout, parsed_args):
+        if column_names:
+            super(TableFormater, self).emit_list(column_names, data, stdout,
+                                                 parsed_args)
+        else:
+            stdout.write('\n')
+
+
 class QuantumCommand(command.OpenStackCommand):
     api = 'network'
     log = logging.getLogger(__name__ + '.QuantumCommand')
     values_specs = []
     json_indent = None
 
+    def __init__(self, app, app_args):
+        super(QuantumCommand, self).__init__(app, app_args)
+        if hasattr(self, 'formatters'):
+            self.formatters['table'] = TableFormater()
+
     def get_client(self):
         return self.app.client_manager.quantum
 
diff --git a/tools/pip-requires b/tools/pip-requires
@@ -1,5 +1,5 @@
 argparse
-cliff>=1.3.1
+cliff>=1.3.2
 httplib2
 iso8601
 prettytable>=0.6,<0.8
