diff options
| author | Timo Furrer <tuxtimo@gmail.com> | 2019-03-02 15:06:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 15:06:21 +0100 |
| commit | a10327a2833da8eee952d8b832afc33c3c55b282 (patch) | |
| tree | cf50b2c819fc562b90158264c7a05eb4727382f8 /tablib | |
| parent | dc24fda41505d9961cd43939893a1cea3598ad18 (diff) | |
| parent | e0de42ef061d90e92463964202d2807ce861f5c0 (diff) | |
| download | tablib-a10327a2833da8eee952d8b832afc33c3c55b282.tar.gz | |
Merge pull request #350 from browniebroke/bugfix/invalid-ascii-csv
Import ascii characters not valid with unicode literals - updated
Diffstat (limited to 'tablib')
| -rw-r--r-- | tablib/compat.py | 4 | ||||
| -rw-r--r-- | tablib/core.py | 2 | ||||
| -rw-r--r-- | tablib/formats/_csv.py | 9 | ||||
| -rw-r--r-- | tablib/formats/_tsv.py | 4 |
4 files changed, 7 insertions, 12 deletions
diff --git a/tablib/compat.py b/tablib/compat.py index f054ebb..660697d 100644 --- a/tablib/compat.py +++ b/tablib/compat.py @@ -27,11 +27,11 @@ if is_py3: else: from cStringIO import StringIO as BytesIO - from cStringIO import StringIO + from StringIO import StringIO from tablib.packages import markup from tablib.packages.statistics import median from itertools import izip_longest - import unicodecsv as csv + from backports import csv import tablib.packages.dbfpy as dbfpy unicode = unicode diff --git a/tablib/core.py b/tablib/core.py index 809bb6e..78c4dce 100644 --- a/tablib/core.py +++ b/tablib/core.py @@ -862,7 +862,7 @@ class Dataset(object): against each cell value. """ - if isinstance(col, str): + if isinstance(col, unicode): if col in self.headers: col = self.headers.index(col) # get 'key' index from each data else: diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py index 06e7830..8b536a7 100644 --- a/tablib/formats/_csv.py +++ b/tablib/formats/_csv.py @@ -3,15 +3,14 @@ """ Tablib - *SV Support. """ -from tablib.compat import is_py3, csv, StringIO +from tablib.compat import csv, StringIO, unicode title = 'csv' extensions = ('csv',) -DEFAULT_ENCODING = 'utf-8' -DEFAULT_DELIMITER = ',' +DEFAULT_DELIMITER = unicode(',') def export_set(dataset, **kwargs): @@ -19,8 +18,6 @@ def export_set(dataset, **kwargs): stream = StringIO() kwargs.setdefault('delimiter', DEFAULT_DELIMITER) - if not is_py3: - kwargs.setdefault('encoding', DEFAULT_ENCODING) _csv = csv.writer(stream, **kwargs) @@ -36,8 +33,6 @@ def import_set(dset, in_stream, headers=True, **kwargs): dset.wipe() kwargs.setdefault('delimiter', DEFAULT_DELIMITER) - if not is_py3: - kwargs.setdefault('encoding', DEFAULT_ENCODING) rows = csv.reader(StringIO(in_stream), **kwargs) for i, row in enumerate(rows): diff --git a/tablib/formats/_tsv.py b/tablib/formats/_tsv.py index 9380b3b..1c6d6a1 100644 --- a/tablib/formats/_tsv.py +++ b/tablib/formats/_tsv.py @@ -3,6 +3,7 @@ """ Tablib - TSV (Tab Separated Values) Support. """ +from tablib.compat import unicode from tablib.formats._csv import ( export_set as export_set_wrapper, import_set as import_set_wrapper, @@ -12,8 +13,7 @@ from tablib.formats._csv import ( title = 'tsv' extensions = ('tsv',) -DEFAULT_ENCODING = 'utf-8' -DELIMITER = '\t' +DELIMITER = unicode('\t') def export_set(dataset): """Returns TSV representation of Dataset.""" |