diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2010-09-08 18:06:40 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2010-09-08 18:06:40 -0400 |
| commit | 2994a9fc0d00f40a2d3dff220e06a5d60a0d158b (patch) | |
| tree | 6bf6d8573c1c9b15af009bdf4e967905ddee4cda /tablib | |
| parent | 4b6fbe9225fb0112b8c0ee9a23dd2ea5297b3205 (diff) | |
| parent | 9f025dc1112d9b9986566143af45ae5620a8f2c8 (diff) | |
| download | tablib-0.0.5.tar.gz | |
Merge branch 'release/0.0.5'v0.0.5
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/core.py | 19 | ||||
| -rw-r--r-- | tablib/packages/xlwt/__init__.py | 2 | ||||
| -rw-r--r-- | tablib/tests/tests.py | 8 |
3 files changed, 14 insertions, 15 deletions
diff --git a/tablib/core.py b/tablib/core.py index 9404703..6ce9316 100644 --- a/tablib/core.py +++ b/tablib/core.py @@ -24,6 +24,7 @@ except ImportError, why: __all__ = ['Dataset', 'source'] +__name__ = 'tablib' __version__ = '0.0.4' __build__ = '0x000004' __author__ = 'Kenneth Reitz' @@ -167,18 +168,20 @@ class Dataset(object): for j, col in enumerate(row): ws.write(i, j, col) - doc = xlwt.CompoundDoc.XlsDoc() - doc.save(stream, wb.get_biff_data()) - + wb.save(stream) return stream.getvalue() - def append(self, row, index=None): - # todo: impliment index + def append(self, row): + """Adds a row to the end of Dataset""" self._validate(row) self._data.append(tuple(row)) - + def index(self, i, row): + """Inserts a row at given position in Dataset""" + self._validate(row) + self._data.insert(i, tuple(row)) + def sort_by(self, key): """Sorts datastet by given key""" # todo: accpept string if headers, or index nubmer @@ -188,9 +191,7 @@ class Dataset(object): def save(self, filename=None, format=None): """Saves dataset""" if not format: - # set format from filename -# format = filename - pass + format = filename.split('.')[-1].lower() # set format from filename if format not in FILE_EXTENSIONS: raise UnsupportedFormat diff --git a/tablib/packages/xlwt/__init__.py b/tablib/packages/xlwt/__init__.py index 5053413..6f2a1b5 100644 --- a/tablib/packages/xlwt/__init__.py +++ b/tablib/packages/xlwt/__init__.py @@ -14,5 +14,3 @@ from Column import Column from Formatting import Font, Alignment, Borders, Pattern, Protection
from Style import XFStyle, easyxf
from ExcelFormula import *
-
-import CompoundDoc
diff --git a/tablib/tests/tests.py b/tablib/tests/tests.py index 187fb27..55fa083 100644 --- a/tablib/tests/tests.py +++ b/tablib/tests/tests.py @@ -20,7 +20,7 @@ data.append(['kenneth' ,'reitz', 4.3]) #print data.json data.headers = None -#print data.csv -print data.xls -#print data.yaml -#print data.json
\ No newline at end of file +print data.csv +#print len(data.xls) +print data.yaml +print data.json
\ No newline at end of file |
