summaryrefslogtreecommitdiff
path: root/addons/base_import/models/odf_ods_reader.py
diff options
context:
space:
mode:
authorxmo-odoo <xmo@odoo.com>2017-05-10 09:39:55 +0200
committerGitHub <noreply@github.com>2017-05-10 09:39:55 +0200
commitfffaf735f58f1ac57781c095eb552de6d1fcdc47 (patch)
tree88ab0ab65430d871862a836524e0ecc890d1674d /addons/base_import/models/odf_ods_reader.py
parent10eee18a047d35305dc46282e610e88936d81ffc (diff)
[FIX] P3: list -> iterable builtins (#16811)
In Python 3: * various builtins and dict methods were changed to return view/iterable objects rather than lists * and the separate Python 2 view/iterable builtins and methods were removed altogether This is problematic when using these items as list (which the happens repeatedly in Odoo), but more viciously when iterating *multiple times* over them (which also happens, which I've messed up multiple times while writing this, and which is a pain to debug even when you've just created the issue). Convert all code using these to semantics-matching cross-version helper functions to get the LCD behaviour between P2 and P3, and forbid the builtins via lint. issue #8530
Diffstat (limited to 'addons/base_import/models/odf_ods_reader.py')
-rw-r--r--addons/base_import/models/odf_ods_reader.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/base_import/models/odf_ods_reader.py b/addons/base_import/models/odf_ods_reader.py
index 0f0142f3f04..c2613c6baa5 100644
--- a/addons/base_import/models/odf_ods_reader.py
+++ b/addons/base_import/models/odf_ods_reader.py
@@ -19,6 +19,8 @@ from odf import opendocument
from odf.table import Table, TableRow, TableCell
from odf.text import P
+from odoo.tools import pycompat
+
class ODSReader(object):
@@ -95,4 +97,4 @@ class ODSReader(object):
return self.SHEETS[name]
def getFirstSheet(self):
- return next(iter(self.SHEETS.itervalues()))
+ return next(iter(pycompat.values(self.SHEETS)))