From b70d0dab52d3cbbb49d88ae2e9cc5e72f222cbc2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 10 Oct 2012 14:38:27 +0200 Subject: [PATCH] [FIX] cases where options dict is decoded as unicode strings on windows: csv.reader kwargs *must* be strings bzr revid: xmo@openerp.com-20121010123827-x76udyurqzgnqebg --- addons/base_import/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_import/models.py b/addons/base_import/models.py index 16bb52d5856..996dbf7964d 100644 --- a/addons/base_import/models.py +++ b/addons/base_import/models.py @@ -128,8 +128,8 @@ class ir_import(orm.TransientModel): """ csv_iterator = csv.reader( StringIO(record.file), - quotechar=options['quoting'], - delimiter=options['separator']) + quotechar=str(options['quoting']), + delimiter=str(options['separator'])) csv_nonempty = itertools.ifilter(None, csv_iterator) # TODO: guess encoding with chardet? Or https://github.com/aadsm/jschardet encoding = options.get('encoding', 'utf-8')