diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 1f654fdf4..c1ee90df6 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1426,13 +1426,15 @@ class Import(models.Model): @property def data_table(self): with open(self.imported_file.path) as csv_file: - try: - return [line for line in unicodecsv.reader(csv_file, - encoding=self.encoding)] - except UnicodeDecodeError: - if encoding != encodings[-1]: - csv_file.seek(0) - return [] + encodings = [self.encoding] + encodings += [coding for coding, c in ENCODINGS] + for encoding in encodings: + try: + return [line for line in unicodecsv.reader(csv_file, + encoding=encoding)] + except UnicodeDecodeError: + if encoding != encodings[-1]: + csv_file.seek(0) return [] def initialize(self): |