diff options
| author | Adrian Torres <adt@odoo.com> | 2020-02-04 11:57:37 +0000 |
|---|---|---|
| committer | Adrian Torres <adt@odoo.com> | 2020-04-01 12:45:40 +0000 |
| commit | 5952928b42de348c91cc61c9615fbb49e9df4146 (patch) | |
| tree | 5f382074d9480c46c8490b1bee22ef9353c7aee3 /odoo/tests | |
| parent | c248594ee5255b232e42438783b9061d235153cb (diff) | |
[REM] *: remove various unused import shims
Before this commit, a lot of leftover import shims existed in the
codebase for py2-py3 compatibility, these are no longer needed since
Odoo 13.0+ doesn't support Python 2 anymore and is (finally) in EOL.
With this commit, these shims are dropped, making the code cleaner,
easier to read and with one less dependency.
Queue -> queue -> py2-py3 compatibility
xmlrpclib -> xmlrpc.client -> py2-py3 compatibility
ConfigParser -> configparser -> py2-py3 compatibility
itertools.izip_longest -> itertools.zip_longest -> py2-py3 compatibility
urllib -> urllib.request -> py2-py3 compatibility
__builtins__ -> builtins -> py2-py3 compatibility
_winreg -> winreg -> py2-py3 compatibility
mock -> unittest.mock -> merged into CPython
The debian/fedora packages and requirements.txt have been updated accordingly
closes odoo/odoo#44601
Related: odoo/enterprise#8141
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
Diffstat (limited to 'odoo/tests')
| -rw-r--r-- | odoo/tests/common.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/odoo/tests/common.py b/odoo/tests/common.py index 610ead0cbf9..7dc9ba076f2 100644 --- a/odoo/tests/common.py +++ b/odoo/tests/common.py @@ -32,7 +32,9 @@ from datetime import datetime, date from unittest.mock import patch from decorator import decorator +from itertools import zip_longest as izip_longest from lxml import etree, html +from xmlrpc import client as xmlrpclib from odoo.models import BaseModel from odoo.osv.expression import normalize_domain, TRUE_LEAF, FALSE_LEAF @@ -41,21 +43,11 @@ from odoo.tools.misc import find_in_path from odoo.tools.safe_eval import safe_eval try: - from itertools import zip_longest as izip_longest -except ImportError: - from itertools import izip_longest - -try: import websocket except ImportError: # chrome headless tests will be skipped websocket = None -try: - from xmlrpc import client as xmlrpclib -except ImportError: - # pylint: disable=bad-python3-import - import xmlrpclib import odoo import pprint |