summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-03-27 11:08:50 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:41:37 +0200
commit68c7adede80eeced7adac9423680fa1abe2c9ff9 (patch)
tree60b14cf1f5e61cd86bc145403dfc9a77e719087b
parent7f5b204f3b613bb7abfe18f6e47e92884cf2cd3b (diff)
downloadIshtar-68c7adede80eeced7adac9423680fa1abe2c9ff9.tar.bz2
Ishtar-68c7adede80eeced7adac9423680fa1abe2c9ff9.zip
Data importer: escape unicode error (managed later with python3)
-rw-r--r--ishtar_common/data_importer.py9
1 files changed, 6 insertions, 3 deletions
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: