summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-07-29 15:00:14 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-07-29 15:00:14 +0200
commitb3299ef2a1ffa236309631672bff6f82bf0ae6be (patch)
tree2c269890a96d7c096dc79c61da94a2a891612de5
parent51337358f0a5defc85653f175de67428d4e152a2 (diff)
downloadIshtar-b3299ef2a1ffa236309631672bff6f82bf0ae6be.tar.bz2
Ishtar-b3299ef2a1ffa236309631672bff6f82bf0ae6be.zip
Data importer: force str for error (translation issue)
-rw-r--r--ishtar_common/data_importer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index a59e7f7a7..f04d04c40 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -143,7 +143,7 @@ class ImporterError(Exception):
self.type = type
def __str__(self):
- return self.msg
+ return str(self.msg)
class Formater(object):
@@ -1933,9 +1933,11 @@ class Importer(object):
[(v and str(v).replace('"', '""')) or empty
for v in values]) + u'"'
- def _get_csv(self, rows, header=[], empty=u"-"):
+ def _get_csv(self, rows, header=None, empty=u"-"):
if not rows:
return ""
+ if not header:
+ header = []
csv_v = []
if header:
csv_v.append(self._format_csv_line(header, empty=empty))