Merge pull request #322 from django-import-export/fix-127-csv-as-text

Open csv with as text and not binary (FIX #127)

import_export/formats/base_formats.py

@@ -119,19 +119,10 @@ def is_binary(self):
         return False
 
 
-class CSV(TablibFormat):
-    """
-    CSV is treated as binary in Python 2.
-    """
+class CSV(TextFormat):
     TABLIB_MODULE = 'tablib.formats._csv'
     CONTENT_TYPE = 'text/csv'
 
-    def get_read_mode(self):
-        return 'rU' if six.PY3 else 'rb'
-
-    def is_binary(self):
-        return False if six.PY3 else True
-
 
 class JSON(TextFormat):
     TABLIB_MODULE = 'tablib.formats._json'

tests/core/exports/books-dos.csv

@@ -0,0 +1,2 @@
+id,name,author_email
+1,Some book,test@example.com

tests/core/tests/base_formats_tests.py

@@ -1,7 +1,8 @@
 from __future__ import unicode_literals
 
+import os
+
 from django.test import TestCase
-from django.utils import six
 
 from import_export.formats import base_formats
 
@@ -14,5 +15,15 @@ def test_binary_format(self):
 
 class CSVTest(TestCase):
 
-    def test_binary_format(self):
-        self.assertEqual(base_formats.CSV().is_binary(), not six.PY3)
+    def setUp(self):
+        self.format = base_formats.CSV()
+
+    def test_import_dos(self):
+        filename = os.path.join(
+            os.path.dirname(__file__),
+            os.path.pardir,
+            'exports',
+            'books-dos.csv')
+        in_stream = open(filename, self.format.get_read_mode()).read()
+        expected = 'id,name,author_email\n1,Some book,test@example.com\n'
+        self.assertEqual(in_stream, expected)