summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2011-12-24 23:05:03 -0800
committerKenneth Reitz <me@kennethreitz.com>2011-12-24 23:05:03 -0800
commitc87a954a9ec539814aee65ec40d86e33147e227e (patch)
treece638bcc8be4a243a300caad343e365034e4505f
parent42e40ed0ab4859995264abb7ee3ba338b5e0371b (diff)
parent23ab6c4724cded5dac64c164773b76794ec3b00e (diff)
downloadtablib-c87a954a9ec539814aee65ec40d86e33147e227e.tar.gz
Merge pull request #43 from svetlyak40wt/develop
Render table in Markdown format on unicode(dataset). Closes #41.
-rw-r--r--tablib/core.py17
-rwxr-xr-xtest_tablib.py16
2 files changed, 33 insertions, 0 deletions
diff --git a/tablib/core.py b/tablib/core.py
index 1bdd49f..80f4418 100644
--- a/tablib/core.py
+++ b/tablib/core.py
@@ -223,6 +223,23 @@ class Dataset(object):
except AttributeError:
return '<dataset object>'
+ def __unicode__(self):
+ result = [self.__headers]
+
+ result.extend(map(unicode, row) for row in self._data)
+
+ # here, we calculate max width for each column
+ lens = (map(len, row) for row in result)
+ field_lens = map(max, zip(*lens))
+
+ # delimiter between header and data
+ result.insert(1, [u'-' * length for length in field_lens])
+
+ format_string = u'|'.join(u'{%s:%s}' % item for item in enumerate(field_lens))
+
+ return u'\n'.join(format_string.format(*row) for row in result)
+
+
# ---------
# Internals
diff --git a/test_tablib.py b/test_tablib.py
index 5455c28..0bfb417 100755
--- a/test_tablib.py
+++ b/test_tablib.py
@@ -649,6 +649,22 @@ class TablibTestCase(unittest.TestCase):
self.assertEquals(self.founders[orig_target_header], data[target_header])
+ def test_unicode_renders_markdown_table(self):
+ # add another entry to test right field width for
+ # integer
+ self.founders.append(('Old', 'Man', 100500))
+
+ self.assertEquals(
+ u"""
+first_name|last_name |gpa
+----------|----------|------
+John |Adams |90
+George |Washington|67
+Thomas |Jefferson |50
+Old |Man |100500
+""".strip(),
+ unicode(self.founders)
+ )
if __name__ == '__main__':