diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-06 17:39:42 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-06 17:39:42 +0200 |
commit | 56e970d135ed542003b3ace21dddd1292297f486 (patch) | |
tree | 07bf7b5f0d5f5c0b924ee7d57663624c61986ff0 /ishtar_common/data_importer.py | |
parent | f1c466e2ce7f09feb66ad2ca1c071e7f6382be4e (diff) | |
download | Ishtar-56e970d135ed542003b3ace21dddd1292297f486.tar.bz2 Ishtar-56e970d135ed542003b3ace21dddd1292297f486.zip |
Fix data import after merge
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r-- | ishtar_common/data_importer.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 2f1d09199..5b501af17 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -511,8 +511,6 @@ class Importer(object): self._defaults[k].update(self.EXTRA_DEFAULTS[k]) self.history_modifier = history_modifier self.output = output - self.result = [] - self.result_cols = [] if not self.history_modifier: if self.import_instance: self.history_modifier = self.import_instance.user @@ -625,15 +623,6 @@ class Importer(object): except ImporterError, msg: self.errors.append((idx_line, None, msg)) - report_name = 'report-%s.csv' % datetime.datetime.now().isoformat() - with open(report_name, 'w') as validity_file: - self.validity_file = UnicodeWriter(validity_file, - delimiter=',', quotechar='"', - quoting=csv.QUOTE_MINIMAL) - self.validity_file.writerow(self.result_cols) - for line in self.result: - self.validity_file.writerow(line) - def _line_processing(self, idx_line, line): if self.skip_lines > idx_line: self.validity.append(line) @@ -735,19 +724,6 @@ class Importer(object): obj = self.post_processing(obj, data) - # writing report - self.result.append([]) - for k in data.keys(): - if k not in self.result_cols: - self.result_cols.append(k) - for k in self.result_cols: - if hasattr(obj, k): - self.result[-1].append(unicode(getattr(obj, k))) - elif k not in data or not data[k]: - self.result[-1].append('') - else: - self.result[-1].append(unicode(data[k])) - def _row_processing(self, c_row, idx_col, idx_line, val, data): if idx_col >= len(self.line_format): return |