diff options
| author | Xavier Morel <xmo@odoo.com> | 2020-03-13 11:05:57 +0000 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2020-03-19 09:32:21 +0000 |
| commit | fe376d50d0c6da332a5ea2540c95583931dd2203 (patch) | |
| tree | a718fde95743556c759eac61c61b00a53308540a /odoo/addons/base/models/qweb.py | |
| parent | 41822a5022dea39a24018d1fa62644be399f7d5f (diff) | |
[FIX] core, base: leftover deprecation warnings
* from collections import <ABC> is deprecated, unclear why the
deprecation warning didn't appear before (possibly only appears in
3.7/3.8?) either way `collections.abc` should be 3.3+ so switch
everything to it.
* add some more ignores on third-party packages deprecation
warnings (meh)
* while at it, mitigate generation of non-breaking space on some
versions of Babel (in the french locale used by our tests anyway)
closes odoo/odoo#47581
Related: odoo/enterprise#9214
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
Diffstat (limited to 'odoo/addons/base/models/qweb.py')
| -rw-r--r-- | odoo/addons/base/models/qweb.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/odoo/addons/base/models/qweb.py b/odoo/addons/base/models/qweb.py index 30b1eb41e35..02eebb87fa3 100644 --- a/odoo/addons/base/models/qweb.py +++ b/odoo/addons/base/models/qweb.py @@ -5,7 +5,8 @@ import os.path import re import traceback -from collections import OrderedDict, Sized, Mapping +from collections import OrderedDict +from collections.abc import Sized, Mapping from functools import reduce from itertools import tee, count from textwrap import dedent @@ -18,13 +19,8 @@ from werkzeug.utils import escape as _escape from odoo.tools import pycompat, freehash -try: - import builtins - builtin_defaults = {name: getattr(builtins, name) for name in dir(builtins)} -except ImportError: - # pylint: disable=bad-python3-import - import __builtin__ - builtin_defaults = {name: getattr(__builtin__, name) for name in dir(__builtin__)} +import builtins +builtin_defaults = {name: getattr(builtins, name) for name in dir(builtins)} try: import astor |