diff options
| author | xmo-odoo <xmo@odoo.com> | 2017-05-10 09:39:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 09:39:55 +0200 |
| commit | fffaf735f58f1ac57781c095eb552de6d1fcdc47 (patch) | |
| tree | 88ab0ab65430d871862a836524e0ecc890d1674d /addons/anonymization | |
| parent | 10eee18a047d35305dc46282e610e88936d81ffc (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/anonymization')
| -rw-r--r-- | addons/anonymization/models/anonymization.py | 2 | ||||
| -rw-r--r-- | addons/anonymization/wizard/anonymize_wizard.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/anonymization/models/anonymization.py b/addons/anonymization/models/anonymization.py index 65928db4b0a..2d4fe1b17d2 100644 --- a/addons/anonymization/models/anonymization.py +++ b/addons/anonymization/models/anonymization.py @@ -76,7 +76,7 @@ class IrModelFieldsAnonymization(models.Model): @api.multi def write(self, vals): # check field state: all should be clear before we can modify a field: - if not len(vals.keys()) == 1 and vals.get('state') == 'clear': + if not len(vals) == 1 and vals.get('state') == 'clear': self._check_write() if vals.get('field_name') and vals.get('model_name'): vals['model_id'], vals['field_id'] = self._get_model_and_field_ids(vals) diff --git a/addons/anonymization/wizard/anonymize_wizard.py b/addons/anonymization/wizard/anonymize_wizard.py index a0b355d4330..b9c35483e18 100644 --- a/addons/anonymization/wizard/anonymize_wizard.py +++ b/addons/anonymization/wizard/anonymize_wizard.py @@ -270,7 +270,7 @@ class IrModelFieldsAnonymizeWizard(models.TransientModel): data = pickle.loads(base64.decodestring(self.file_import)) fixes = self.env['ir.model.fields.anonymization.migration.fix'].search_read([ - ('target_version', '=', '.'.join(map(str, version_info[:2]))) + ('target_version', '=', '.'.join(str(v) for v in version_info[:2])) ], ['model_name', 'field_name', 'query', 'query_type', 'sequence']) fixes = group(fixes, ('model_name', 'field_name')) |