MEI-15697 Staff tools - download failure

lms/djangoapps/instructor_task/models.py

@@ -230,14 +230,14 @@ def from_config(cls, config_name):
             )
         return DjangoStorageReportStore.from_config(config_name)
 
-    def _get_utf8_encoded_rows(self, rows):
+    def _get_utf8_encoded_rows(self, rows, encode_for_utf8=False):
         """
         Given a list of `rows` containing unicode strings, return a
         new list of rows with those strings encoded as utf-8 for CSV
         compatibility.
         """
         for row in rows:
-            if six.PY2:
+            if six.PY2 or encode_for_utf8:
                 yield [six.text_type(item).encode('utf-8') for item in row]
             else:
                 yield [six.text_type(item) for item in row]
@@ -315,9 +315,9 @@ def store_rows(self, course_id, filename, rows):
         if six.PY2:
             output_buffer.write(codecs.BOM_UTF8)
         csvwriter = csv.writer(output_buffer)
-        csvwriter.writerows(self._get_utf8_encoded_rows(rows))
+        csvwriter.writerows(self._get_utf8_encoded_rows(rows, encode_for_utf8=True))
         output_buffer.seek(0)
-        self.store(course_id, filename, output_buffer)
+        self.store(course_id, filename, output_buffer, batched=True)
 
     def links_for(self, course_id):
         """