Merge https://github.com/playpauseandstop/tablib into developfeature/xls-width

2 files changed, 14 insertions, 1 deletions

diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py
index 2c74a1c..b71755b 100644
--- a/tablib/formats/_csv.py
+++ b/tablib/formats/_csv.py
@@ -31,7 +31,7 @@ def import_set(dset, in_stream, headers=True):
 
     dset.wipe()
 
-    rows = csv.reader(in_stream.split())
+    rows = csv.reader(in_stream.splitlines())
     for i, row in enumerate(rows):
 
         if (i == 0) and (headers):
diff --git a/test_tablib.py b/test_tablib.py
index e4a4d11..4079809 100755
--- a/test_tablib.py
+++ b/test_tablib.py
@@ -295,6 +295,19 @@ class TablibTestCase(unittest.TestCase):
 
         self.assertEqual(_csv, data.csv)
 
+    def test_csv_import_set_with_spaces(self):
+        """Generate and import CSV set serialization when row values have
+        spaces."""
+        data.append(('Bill Gates', 'Microsoft'))
+        data.append(('Steve Jobs', 'Apple'))
+        data.headers = ('Name', 'Company')
+
+        _csv = data.csv
+
+        data.csv = _csv
+
+        self.assertEqual(_csv, data.csv)
+
     def test_tsv_import_set(self):
         """Generate and import TSV set serialization."""
         data.append(self.john)