summaryrefslogtreecommitdiff
path: root/tablib
diff options
context:
space:
mode:
authorIuri de Silvio <iurisilvio@gmail.com>2014-05-02 11:25:30 -0300
committerIuri de Silvio <iurisilvio@gmail.com>2014-05-02 11:25:30 -0300
commitcf5239f097b720d650b5e43f16415c1f79fcef0d (patch)
treeeb9d77d2109dd17b1a4ea4f5dec4b1fd7ba45126 /tablib
parentfbd277ff2ef96343fa4bb41e5fff6c37af674951 (diff)
parent49d8cb816f163ab5239ec9552c5d60cd0e386557 (diff)
downloadtablib-cf5239f097b720d650b5e43f16415c1f79fcef0d.tar.gz
Merge pull request #150 from brad/csv-newlines
Allow csv fields to have multiple lines.
Diffstat (limited to 'tablib')
-rw-r--r--tablib/formats/_csv.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py
index c5d3202..7597395 100644
--- a/tablib/formats/_csv.py
+++ b/tablib/formats/_csv.py
@@ -35,9 +35,9 @@ def import_set(dset, in_stream, headers=True):
dset.wipe()
if is_py3:
- rows = csv.reader(in_stream.splitlines())
+ rows = csv.reader(StringIO(in_stream))
else:
- rows = csv.reader(in_stream.splitlines(), encoding=DEFAULT_ENCODING)
+ rows = csv.reader(StringIO(in_stream), encoding=DEFAULT_ENCODING)
for i, row in enumerate(rows):
if (i == 0) and (headers):