diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-12 21:13:28 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-12 21:13:28 +0200 |
| commit | b6e922a450d7780cefa196e5e6cc67c393bb338f (patch) | |
| tree | 136ff886ec546b6049f136fe43ed8e58f13aa75b /ishtar_common/data_importer.py | |
| parent | 56e970d135ed542003b3ace21dddd1292297f486 (diff) | |
| parent | 0d4f06d918dd82212403d41b9d88a53080ba724e (diff) | |
| download | Ishtar-b6e922a450d7780cefa196e5e6cc67c393bb338f.tar.bz2 Ishtar-b6e922a450d7780cefa196e5e6cc67c393bb338f.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/data_importer.py
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 5b501af17..98e681635 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -543,7 +543,7 @@ class Importer(object): vals.append([]) vals[idx_col].append(val) for idx, formater in enumerate(self.line_format): - if formater: + if formater and idx < len(vals): formater.init(vals[idx], output, choose_default=choose_default) def importation(self, table, initialize=True, choose_default=False): @@ -914,8 +914,8 @@ class Importer(object): return data def _format_csv_line(self, values): - return u",".join([v and unicode(v).replace('"', '""') or u'-' - for v in values]) + return u'"' + u'","'.join([v and unicode(v).replace('"', '""') or u'-' + for v in values]) + u'"' def _get_csv(self, rows, header=[]): if not rows: |