summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-30 23:15:14 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-30 23:15:14 +0200
commitcd35f5584355d93211d61480fd1219b302b0b177 (patch)
tree4cdecaca47fd4281b8ecf99b345682c30a8e26a2 /ishtar_common
parentd4f9e3adaaff86fe581b4a7a5ef93890bee40cf8 (diff)
parentb2e1c602627102d2c63616d98305941c773b24fa (diff)
downloadIshtar-cd35f5584355d93211d61480fd1219b302b0b177.tar.bz2
Ishtar-cd35f5584355d93211d61480fd1219b302b0b177.zip
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/data_importer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 4ac90f074..ea916a30f 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -156,7 +156,7 @@ class ChoiceChecker(object):
class UnicodeFormater(Formater):
def __init__(self, max_length=None, clean=False, re_filter=None,
notnull=False, prefix=u'', db_target=None,
- import_instance=None):
+ import_instance=None, many_split=None):
self.max_length = max_length
self.db_target = db_target
self.clean = clean
@@ -164,6 +164,7 @@ class UnicodeFormater(Formater):
self.notnull = notnull
self.prefix = prefix
self.import_instance = import_instance
+ self.many_split = many_split
def format(self, value):
try: