summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2012-05-06 21:17:06 -0400
committerDoug Hellmann <doug.hellmann@dreamhost.com>2012-05-06 21:17:06 -0400
commit88c5454768f1b9e442a9aa618687d226cd19f965 (patch)
treed02b102e879dccb14ad6314920816615eea0096a
parent43aa8d395ef0da07c81e1ed9cc729ddca0be7281 (diff)
downloadcliff-tablib-88c5454768f1b9e442a9aa618687d226cd19f965.tar.gz
fix yaml, html, and json show formatters
-rw-r--r--cliff/formatters/tablibformatters.py6
-rw-r--r--setup.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/cliff/formatters/tablibformatters.py b/cliff/formatters/tablibformatters.py
index 5cc5489..ec6e280 100644
--- a/cliff/formatters/tablibformatters.py
+++ b/cliff/formatters/tablibformatters.py
@@ -19,9 +19,9 @@ class TablibFormatterBase(ListFormatter, SingleFormatter):
return
def emit_one(self, column_names, data, stdout, parsed_args):
- dataset = tablib.Dataset(headers=column_names)
- for row in data:
- dataset.append(row)
+ dataset = tablib.Dataset(headers=('Field', 'Value'))
+ for name, value in zip(column_names, data):
+ dataset.append((name, value))
stdout.write(self._format_dataset(dataset))
return
diff --git a/setup.py b/setup.py
index ff41d08..b8cf34f 100644
--- a/setup.py
+++ b/setup.py
@@ -173,6 +173,9 @@ setup(
'cliff.formatter.show': [
'table = cliff.formatters.table:TableFormatter',
'shell = cliff.formatters.shell:ShellFormatter',
+ 'yaml = cliff.formatters.tablibformatters:YamlFormatter',
+ 'html = cliff.formatters.tablibformatters:HtmlFormatter',
+ 'json = cliff.formatters.tablibformatters:JsonFormatter',
],
},