entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 8 Releases Wiki Activity

manager: fix import of utf-8 encoded events file (#35479)

This commit is contained in:
Serghei Mihai 2019-08-20 16:14:35 +02:00 committed by Frédéric Péters
parent 14d5615806
commit 2310528fc2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/manager/forms.py
View File

@ -179,7 +179,7 @@ class ImportEventsForm(forms.Form):
# this line with content being a unicode string.
try:
dialect = csv.Sniffer().sniff(content)
dialect = csv.Sniffer().sniff(content if six.PY3 else content.encode('utf-8'))
except csv.Error:
dialect = None

7
tests/test_manager.py
View File

@ -616,6 +616,13 @@ def test_import_events(app, admin_user):
assert Event.objects.count() == 2
Event.objects.all().delete()
resp = app.get('/manage/agendas/%s/import-events' % agenda.id, status=200)
resp.form['events_csv_file'] = Upload('t.csv', '"date"\t"time"\t"etc."\n'
'"2016-09-16"\t"18:00"\t"10"\t"5"\t"éléphant"\n'
'"2016-09-19"\t"18:00"\t"10"'.encode('iso-8859-15'), 'text/csv')
resp = resp.form.submit(status=302)
assert Event.objects.count() == 2
def test_add_meetings_agenda(app, admin_user):
app = login(app)