Add TextIOWrapper instead of StringIO buffer

newdle/export.py

@@ -1,6 +1,7 @@
 import csv
 import datetime
-from io import BytesIO, StringIO
+from contextlib import contextmanager
+from io import BytesIO, TextIOWrapper
 
 from xlsxwriter import Workbook
 
@@ -26,15 +27,23 @@ def _generate_answers_for_export(newdle):
  return rows
 
 
+@contextmanager
+def csv_text_io_wrapper(buf):
+ """IO wrapper to use the csv reader/writer on a byte stream."""
+ w = TextIOWrapper(buf, encoding='utf-8-sig', newline='')
+ try:
+ yield w
+ finally:
+ w.detach()
+
+
 def export_answers_to_csv(newdle):
  rows = _generate_answers_for_export(newdle)
  buffer = BytesIO()
- output = StringIO()
- writer = csv.writer(output, dialect='unix')
- writer.writerows(rows)
- buffer.write(output.getvalue().encode('utf-8-sig'))
+ with csv_text_io_wrapper(buffer) as csvbuf:
+ writer = csv.writer(csvbuf, dialect='unix', quoting=csv.QUOTE_MINIMAL)
+ writer.writerows(rows)
  buffer.seek(0)
- output.close()
 
  return buffer
 

tests/api_test.py

@@ -1374,13 +1374,13 @@ def test_answer_export(snapshot, monkeypatch, flask_client, dummy_uid):
  snapshot.snapshot_dir = Path(__file__).parent / 'export'
  p1 = Participant.query.filter_by(code='part1').first()
  p1.answers = {datetime(2019, 9, 11, 14, 0): Availability.available}
- p1.comment = 'Available, comment'
+ p1.comment = 'Hello, world'
  Participant.query.filter_by(code='part2').first().answers = {
  datetime(2019, 9, 11, 14, 0): Availability.unavailable
  }
  p3 = Participant.query.filter_by(code='part3').first()
  p3.answers = {datetime(2019, 9, 11, 14, 0): Availability.ifneedbe}
- p3.comment = 'Comment'
+ p3.comment = 'Hello world'
 
  resp = flask_client.get(
  url_for('api.export_participants', code='dummy', format='csv'),

tests/export/answers.csv

@@ -1,4 +1,4 @@
-"Participant name","2019-09-11T13:00","2019-09-11T14:00","2019-09-12T13:00","2019-09-12T13:30","Comment"
-"Albert Einstein","","unavailable","","",""
-"Guinea Pig","","ifneedbe","","","Comment"
-"Tony Stark","","available","","","Available, comment"
+Participant name,2019-09-11T13:00,2019-09-11T14:00,2019-09-12T13:00,2019-09-12T13:30,Comment
+Albert Einstein,,unavailable,,,
+Guinea Pig,,ifneedbe,,,Hello world
+Tony Stark,,available,,,"Hello, world"