Merge ca2be09 into 14803db

postgres_copy/copy_from.py

@@ -5,8 +5,8 @@
 """
 import os
 import sys
-import csv
 import logging
+from six import ensure_binary, ensure_str
 from collections import OrderedDict
 from django.db import NotSupportedError
 from django.db import connections, router
@@ -150,13 +150,35 @@ def get_headers(self):
         Returns the column headers from the csv as a list.
         """
         logger.debug("Retrieving headers from {}".format(self.csv_file))
-        # Open it as a CSV
-        csv_reader = csv.reader(self.csv_file, delimiter=self.delimiter)
-        # Pop the headers
-        headers = next(csv_reader)
+
+        # determine what mode the file is opened in
+        file_mode = getattr(
+            self.csv_file, 'mode', getattr(
+                self.csv_file, '_mode', None
+            )
+        )
+        # take the user-defined encoding, or assume utf-8
+        encoding = self.encoding or 'utf-8'
+        # if file is in binary mode...
+        if 'b' in file_mode:
+            # ...coerce delimiter to binary...
+            delimiter = ensure_binary(self.delimiter, encoding=encoding)
+            # ...and coerce each header item to str (and strip whitespace)
+            headers = [
+                ensure_str(h, encoding=encoding).strip()
+                for h in self.csv_file.readline().split(delimiter)
+            ]
+        # if not in binary mode...
+        else:
+            delimiter = self.delimiter
+            # ...just strip whitespace on each header item
+            headers = [
+                h.strip()
+                for h in self.csv_file.readline().split(delimiter)
+            ]
         # Move back to the top of the file
         self.csv_file.seek(0)
-        # Return the headers
+
         return headers
 
     def validate_mapping(self):

tests/tests.py

@@ -102,9 +102,9 @@ def test_export_to_str(self, _):
         self._load_objects(self.name_path)
         export = MockObject.objects.to_csv()
         self.assertEqual(export, b"""id,name,num,dt,parent_id
-86,BEN,1,2012-01-01,
-87,JOE,2,2012-01-02,
-88,JANE,3,2012-01-03,
+89,BEN,1,2012-01-01,
+90,JOE,2,2012-01-02,
+91,JANE,3,2012-01-03,
 """)
 
     @mock.patch("django.db.connection.validate_no_atomic_block")
@@ -350,6 +350,20 @@ def test_simple_save_with_fileobject(self, _):
             date(2012, 1, 1)
         )
 
+    @mock.patch("django.db.connection.validate_no_atomic_block")
+    def test_save_with_binary_fileobject(self, _):
+        f = open(self.name_path, 'rb')
+        MockObject.objects.from_csv(
+            f,
+            dict(name='NAME', number='NUMBER', dt='DATE')
+        )
+        self.assertEqual(MockObject.objects.count(), 3)
+        self.assertEqual(MockObject.objects.get(name='BEN').number, 1)
+        self.assertEqual(
+            MockObject.objects.get(name='BEN').dt,
+            date(2012, 1, 1)
+        )
+
     def test_atomic_block(self):
         with transaction.atomic():
             try: