diff options
| author | Adrian Torres <adt@odoo.com> | 2018-11-08 15:27:30 +0000 |
|---|---|---|
| committer | Adrian Torres <adt@odoo.com> | 2018-11-29 09:28:17 +0000 |
| commit | 52f5528cfb6d1152ee226e268247dc685a8ba329 (patch) | |
| tree | b44ecfa477b50dd3e488f09f623eecc8bc8e9d7d /odoo/addons/base/models/ir_fields.py | |
| parent | e5c864a596b72515837f0ed1e07550398ecc1ab0 (diff) | |
[REF] *: replace deprecated pycompat helpers for builtins
This commit replaces calls to pycompat helpers that were intended for
python 2 <-> python 3 interoperability for python 3 builtins, as python
2 is no longer officially supported by Odoo.
This includes:
* calls to imap/izip/ifilter replaced by map/zip/filter
* uses of text_type replaced by str
* uses of unichr replaced by chr
* calls to implements_to_string, implements_iterator removed
* string_types and integer_types replaced by str, int respectively
* calls to to_native replaced by calls to to_text
This is done in preparation to the removal of these deprecated helpers
in the following commit.
Diffstat (limited to 'odoo/addons/base/models/ir_fields.py')
| -rw-r--r-- | odoo/addons/base/models/ir_fields.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odoo/addons/base/models/ir_fields.py b/odoo/addons/base/models/ir_fields.py index 90208e7a86a..e6392441f74 100644 --- a/odoo/addons/base/models/ir_fields.py +++ b/odoo/addons/base/models/ir_fields.py @@ -8,7 +8,7 @@ import psycopg2 import pytz from odoo import api, fields, models, _ -from odoo.tools import ustr, pycompat +from odoo.tools import ustr REFERENCING_FIELDS = {None, 'id', '.id'} def only_ref_fields(record): @@ -39,9 +39,9 @@ class IrFieldsConverter(models.AbstractModel): @api.model def _format_import_error(self, error_type, error_msg, error_params=(), error_args=None): # sanitize error params for later formatting by the import system - sanitize = lambda p: p.replace('%', '%%') if isinstance(p, pycompat.string_types) else p + sanitize = lambda p: p.replace('%', '%%') if isinstance(p, str) else p if error_params: - if isinstance(error_params, pycompat.string_types): + if isinstance(error_params, str): error_params = sanitize(error_params) elif isinstance(error_params, dict): error_params = {k: sanitize(v) for k, v in error_params.items()} @@ -79,7 +79,7 @@ class IrFieldsConverter(models.AbstractModel): try: converted[field], ws = converters[field](value) for w in ws: - if isinstance(w, pycompat.string_types): + if isinstance(w, str): # wrap warning string in an ImportWarning for # uniform handling w = ImportWarning(w) @@ -270,14 +270,14 @@ class IrFieldsConverter(models.AbstractModel): for item, label in selection: label = ustr(label) labels = [label] + self._get_translations(('selection', 'model', 'code'), label) - if value == pycompat.text_type(item) or value in labels: + if value == str(item) or value in labels: return item, [] raise self._format_import_error( ValueError, _(u"Value '%s' not found in selection field '%%(field)s'"), value, - {'moreinfo': [_label or pycompat.text_type(item) for item, _label in selection if _label or item]} + {'moreinfo': [_label or str(item) for item, _label in selection if _label or item]} ) @api.model |
