diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2010-09-20 14:18:18 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2010-09-20 14:18:31 -0400 |
| commit | e8f5e023c48dc318ede162cf49ae064c8b8e698e (patch) | |
| tree | 39631494e0d4e925785a0f870b9a4c2cf31aa3e0 /tablib/core.py | |
| parent | 81445aeec8ceab0126a17e8d0130b548c5c3eca1 (diff) | |
| download | tablib-e8f5e023c48dc318ede162cf49ae064c8b8e698e.tar.gz | |
Version bump (v0.7.0).
Diffstat (limited to 'tablib/core.py')
| -rw-r--r-- | tablib/core.py | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/tablib/core.py b/tablib/core.py index a86c4ea..f300be6 100644 --- a/tablib/core.py +++ b/tablib/core.py @@ -21,8 +21,8 @@ from helpers import * # __all__ = ['Dataset', 'DataBook'] __name__ = 'tablib' -__version__ = '0.6.4' -__build__ = 0x000604 +__version__ = '0.7.0' +__build__ = 0x000700 __author__ = 'Kenneth Reitz' __license__ = 'MIT' __copyright__ = 'Copyright 2010 Kenneth Reitz' @@ -178,16 +178,21 @@ class Dataset(object): def xls(self, path=None): """Returns XLS representation of Dataset.""" - stream = StringIO.StringIO() wb = xlwt.Workbook(encoding='utf8') ws = wb.add_sheet(self.title if self.title else 'Tabbed Dataset') + for i, row in enumerate(self._package(dicts=False)): for j, col in enumerate(row): ws.write(i, j, col) - wb.save(stream) - return stream.getvalue() + if path: + wb.save(path) + return True + else: + stream = StringIO.StringIO() + wb.save(stream) + return stream.getvalue() def append(self, row=None, col=None): @@ -222,7 +227,7 @@ class Dataset(object): pass -class DataBook(object): +class Databook(object): """A book of Dataset objects. Currently, this exists only for XLS workbook support. """ @@ -265,7 +270,7 @@ class DataBook(object): def xls(self, path=None): """Returns XLS representation of DataBook.""" - stream = cStringIO.StringIO() + wb = xlwt.Workbook(encoding='utf8') for i, dset in enumerate(self._datasets): @@ -276,8 +281,15 @@ class DataBook(object): for j, col in enumerate(row): ws.write(i, j, col) - wb.save(stream) - return stream.getvalue() + + + if path: + wb.save(path) + return True + else: + stream = cStringIO.StringIO() + wb.save(stream) + return stream.getvalue() def json(self): |
