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 /addons/mass_mailing/tests/test_mass_mailing_shortener.py | |
| 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 'addons/mass_mailing/tests/test_mass_mailing_shortener.py')
| -rw-r--r-- | addons/mass_mailing/tests/test_mass_mailing_shortener.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/addons/mass_mailing/tests/test_mass_mailing_shortener.py b/addons/mass_mailing/tests/test_mass_mailing_shortener.py index 681bbbf0062..35ca6a978e3 100644 --- a/addons/mass_mailing/tests/test_mass_mailing_shortener.py +++ b/addons/mass_mailing/tests/test_mass_mailing_shortener.py @@ -3,11 +3,7 @@ from odoo.tests import common from lxml import etree - -try: - from unittest.mock import patch -except ImportError: - from mock import patch +from unittest.mock import patch class TestMassMailingShortener(common.TransactionCase): |