diff options
Diffstat (limited to 'addons/base_import/models/base_import.py')
| -rw-r--r-- | addons/base_import/models/base_import.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/base_import/models/base_import.py b/addons/base_import/models/base_import.py index 35d5692e95b..d6c05217bc9 100644 --- a/addons/base_import/models/base_import.py +++ b/addons/base_import/models/base_import.py @@ -263,15 +263,15 @@ class Import(models.TransientModel): def _read_xls_book(self, book): sheet = book.sheet_by_index(0) # emulate Sheet.get_rows for pre-0.9.4 - for row in pycompat.imap(sheet.row, range(sheet.nrows)): + for row in map(sheet.row, range(sheet.nrows)): values = [] for cell in row: if cell.ctype is xlrd.XL_CELL_NUMBER: is_float = cell.value % 1 != 0.0 values.append( - pycompat.text_type(cell.value) + str(cell.value) if is_float - else pycompat.text_type(int(cell.value)) + else str(int(cell.value)) ) elif cell.ctype is xlrd.XL_CELL_DATE: is_datetime = cell.value % 1 != 0.0 @@ -642,7 +642,7 @@ class Import(models.TransientModel): if options.get('headers'): rows_to_import = itertools.islice(rows_to_import, 1, None) data = [ - list(row) for row in pycompat.imap(mapper, rows_to_import) + list(row) for row in map(mapper, rows_to_import) # don't try inserting completely empty rows (e.g. from # filtering out o2m fields) if any(row) @@ -863,7 +863,7 @@ class Import(models.TransientModel): return { 'messages': [{ 'type': 'error', - 'message': pycompat.text_type(error), + 'message': str(error), 'record': False, }] } |