From 68c7adede80eeced7adac9423680fa1abe2c9ff9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 27 Mar 2019 11:08:50 +0100 Subject: Data importer: escape unicode error (managed later with python3) --- ishtar_common/data_importer.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ishtar_common/data_importer.py') diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 67aa402b8..1b069f324 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1884,9 +1884,12 @@ class Importer(object): return obj, created def _format_csv_line(self, values, empty=u"-"): - return u'"' + u'","'.join( - [(v and unicode(v).replace('"', '""')) or empty - for v in values]) + u'"' + try: + return u'"' + u'","'.join( + [(v and unicode(v).replace('"', '""')) or empty + for v in values]) + u'"' + except UnicodeDecodeError: + return "" def _get_csv(self, rows, header=[], empty=u"-"): if not rows: -- cgit v1.2.3