diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-22 15:29:11 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-22 15:29:11 -0400 |
| commit | 29d626fa1fe2c6d52d4db96f49d417654e9fb91f (patch) | |
| tree | 64f0159a98db3a8980baa62d927a23523c56becb /tablib | |
| parent | 1f22fc73211da0e828ad546701bc3cf9bf0bc4ea (diff) | |
| download | tablib-29d626fa1fe2c6d52d4db96f49d417654e9fb91f.tar.gz | |
2.x bytesio fix
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/compat.py | 2 | ||||
| -rw-r--r-- | tablib/formats/_csv.py | 4 | ||||
| -rw-r--r-- | tablib/formats/_tsv.py | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tablib/compat.py b/tablib/compat.py index 0fac899..0881369 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -28,6 +28,7 @@ if is_py3: from tablib.packages.odf3 import opendocument, style, text, table import csv + from io import StringIO # py3 mappings unicode = str @@ -36,6 +37,7 @@ if is_py3: else: from cStringIO import StringIO as BytesIO + from cStringIO import StringIO import tablib.packages.xlwt as xlwt from tablib.packages import markup from itertools import ifilter diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py index 2e459ff..43da4ab 100644 --- a/tablib/formats/_csv.py +++ b/tablib/formats/_csv.py @@ -7,7 +7,7 @@ import os import tablib -from tablib.compat import is_py3, BytesIO, csv +from tablib.compat import is_py3, csv, StringIO title = 'csv' @@ -20,7 +20,7 @@ DEFAULT_ENCODING = 'utf-8' def export_set(dataset): """Returns CSV representation of Dataset.""" - stream = BytesIO() + stream = StringIO() if is_py3: _csv = csv.writer(stream) diff --git a/tablib/formats/_tsv.py b/tablib/formats/_tsv.py index 85f9396..54838b1 100644 --- a/tablib/formats/_tsv.py +++ b/tablib/formats/_tsv.py @@ -6,7 +6,7 @@ import os import tablib -from tablib.compat import is_py3, csv, BytesIO +from tablib.compat import is_py3, csv, StringIO @@ -17,7 +17,7 @@ DEFAULT_ENCODING = 'utf-8' def export_set(dataset): """Returns a TSV representation of Dataset.""" - stream = BytesIO() + stream = StringIO() if is_py3: _tsv = csv.writer(stream, delimiter="\t") |
