[IMP] fix keys_to_validate, remove useless unlink, fix dialect

This commit is contained in:
Benoit Guillot
2013-05-31 15:55:06 +02:00
parent 24544d73a2
commit 2fbcaf2b2f
3 changed files with 16 additions and 5 deletions

View File

@@ -54,7 +54,7 @@ class FileParser(BankStatementImportParser):
self.ftype = ftype
else:
raise Exception(_('Invalide file type %s. please use csv or xls') % (ftype))
self.keys_to_validate = keys_to_validate
self.keys_to_validate = keys_to_validate or []
self.convertion_dict = convertion_dict
self.fieldnames = header
self._datemode = 0 # used only for xls documents,
@@ -95,7 +95,7 @@ class FileParser(BankStatementImportParser):
We skip the validation step if the file header is provided separately
(in the field: fieldnames).
"""
if self.fieldnames is None and self.keys_to_validate:
if self.fieldnames is None:
parsed_cols = self.result_row_list[0].keys()
for col in self.keys_to_validate:
if col not in parsed_cols:

View File

@@ -28,7 +28,8 @@ def UnicodeDictReader(utf8_data, **kwargs):
utf8_data.seek(pos)
if not kwargs.get('dialect'):
dialect = sniffer.sniff(sample_data, delimiters=',;\t')
del kwargs['dialect']
if 'dialect' in kwargs:
del kwargs['dialect']
else:
dialect = kwargs.pop('dialect')
csv_reader = csv.DictReader(utf8_data, dialect=dialect, **kwargs)