summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-02-24 12:53:12 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-02-24 12:53:12 +0100
commit0150694228b03a31429096eca0c79dfed8aaefe6 (patch)
treefbcfbd7b47d821fcc6677403d5cbf25c8e6bad70
parentee3ec116b055375c97659e90bab5599dda244704 (diff)
downloadIshtar-0150694228b03a31429096eca0c79dfed8aaefe6.tar.bz2
Ishtar-0150694228b03a31429096eca0c79dfed8aaefe6.zip
Importer: fix concatenation when the concat string is empty
-rw-r--r--ishtar_common/data_importer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 02a100325..8ce613755 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1006,7 +1006,7 @@ class Importer(object):
@classmethod
def _field_name_to_data_dict(
cls, field_name, value, data, force_value=False, concat=False,
- concat_str=u"", force_new=False):
+ concat_str="", force_new=False):
field_names = field_name
if type(field_names) not in (list, tuple):
field_names = [field_name]
@@ -1028,8 +1028,8 @@ class Importer(object):
if not value:
continue
current_data[key] = (
- current_data[key] + concat_str) \
- if current_data[key] else u""
+ current_data[key] + (concat_str or "")) \
+ if current_data[key] else ""
current_data[key] += value
elif force_value and value:
if concat_str and key in current_data \