diff options
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 2e6289c88..bb0343add 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -945,7 +945,6 @@ class Importer(object): self.OBJECT_CLS._meta.get_all_field_names(): data['history_modifier'] = self.history_modifier - self.plouf = 0 obj, created = self.get_object(self.OBJECT_CLS, data) if self.import_instance and hasattr(obj, 'imports') \ and created: @@ -1093,30 +1092,30 @@ class Importer(object): if not many_values: value = formated_values[0] - printed_values = value - if type(value) not in (list, tuple): - printed_values = [value] - try: - # don't reunicode - unicoded values - c_values.append(u" ; ".join([v for v in printed_values])) - except TypeError: - c_values.append(u" ; ".join([unicode(v) - for v in printed_values])) - if value is None and formater.required: - self.c_errors = True - self.errors.append((idx_line + 1, idx_col + 1, - self.ERRORS['value_required'])) - return + printed_values = value + if type(value) not in (list, tuple): + printed_values = [value] + try: + # don't reunicode - unicoded values + c_values.append(u" ; ".join([v for v in printed_values])) + except TypeError: + c_values.append(u" ; ".join([unicode(v) + for v in printed_values])) + if value is None and formater.required: + self.c_errors = True + self.errors.append((idx_line + 1, idx_col + 1, + self.ERRORS['value_required'])) + return - field_names = [field_name] - force_news = [force_new] - for duplicate_field in formater.duplicate_fields: - if type(duplicate_field[0]) in (list, tuple): - duplicate_field, force_new = duplicate_field[idx_v] - else: - duplicate_field, force_new = duplicate_field - field_names += [duplicate_field] - force_news += [force_new] + field_names = [field_name] + force_news = [force_new] + for duplicate_field in formater.duplicate_fields: + if type(duplicate_field[0]) in (list, tuple): + duplicate_field, force_new = duplicate_field[idx_v] + else: + duplicate_field, force_new = duplicate_field + field_names += [duplicate_field] + force_news += [force_new] if formater.through: self._throughs.append((formater, value)) |