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/tools | |
| 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/tools')
| -rw-r--r-- | odoo/tools/appdirs.py | 6 | ||||
| -rw-r--r-- | odoo/tools/config.py | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/odoo/tools/appdirs.py b/odoo/tools/appdirs.py index 67ba75625c1..5f5b7bd9d7d 100644 --- a/odoo/tools/appdirs.py +++ b/odoo/tools/appdirs.py @@ -367,11 +367,7 @@ def _get_win_folder_from_registry(csidl_name): registry for this guarantees us the correct answer for all CSIDL_* names. """ - try: - import winreg as _winreg - except ImportError: - # pylint: disable=bad-python3-import - import _winreg + import winreg as _winreg shell_folder_name = { "CSIDL_APPDATA": "AppData", diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 65e22cc37af..c9f6e2556c3 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -1,11 +1,7 @@ #odoo.loggers.handlers. -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -try: - import configparser as ConfigParser -except ImportError: - import ConfigParser - +import configparser as ConfigParser import errno import logging import optparse |