CSV import doesn't work because "iterator should return strings, not bytes"

[rhunwicks]

On DjangoCMS 3.2.5, Django 1.8, Python 2.7 with DjangoCMS Table from master, I can't get the CSV import to work because the CSV reader errors with "iterator should return strings, not bytes" in TableForm.clean_csv_upload().

Based on http://stackoverflow.com/questions/16243023/how-to-resolve-iterator-should-return-strings-not-bytes, the following works for me:

from io import TextIOWrapper


class TableForm(ModelForm):

    def clean_csv_upload(self):
        if self.cleaned_data['csv_upload']:

           # Make sure we decode the file to text
           encoding = self.cleaned_data['csv_upload'].charset if self.cleaned_data['csv_upload'].charset else 'utf-8'
           f = TextIOWrapper(self.cleaned_data['csv_upload'].file, encoding=encoding)
           csv_reader = csv.reader(f, dialect='excel')

[rhunwicks]

Should I create a Merge Request?