diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-22 14:07:17 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-22 14:07:17 -0400 |
| commit | 87e65fd3e77f21efc9efc4ab367611702fcd3cfe (patch) | |
| tree | 51d5236072bbfa8907d607331de42f05860d6a05 /tablib/compat.py | |
| parent | ffbc3b122d7db7740d070112aec023cbbf663f4e (diff) | |
| parent | cceb41af98afe11ef04e1c9b187e70af293c94d0 (diff) | |
| download | tablib-87e65fd3e77f21efc9efc4ab367611702fcd3cfe.tar.gz | |
Merge pull request #14 from f4nt/tablib
---
This should provide basic support for OpenDocument spreadsheets. I didnt have py2.7 installed to test with in tox, but 2.5, 2.6, and py3k passed all tests with tox for me. Lemme know if you see any issues I may have glossed over.
Conflicts:
tablib/compat.py
Diffstat (limited to 'tablib/compat.py')
| -rw-r--r-- | tablib/compat.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tablib/compat.py b/tablib/compat.py index 1175aaa..5fb0096 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -22,11 +22,10 @@ except ImportError: if is_py3: from io import BytesIO - from io import StringIO import tablib.packages.xlwt3 as xlwt from tablib.packages import markup3 as markup from tablib.packages import openpyxl3 as openpyxl - import csv + from tablib.packages.odf3 import opendocument, style, text, table # py3 mappings @@ -41,6 +40,6 @@ else: from tablib.packages import markup from itertools import ifilter from tablib.packages import openpyxl - import tablib.packages.unicodecsv as csv + from tablib.packages.odf import opendocument, style, text, table unicode = unicode
\ No newline at end of file |