[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>

7 files changed, 9 insertions, 42 deletions

diff --git a/odoo/addons/test_new_api/tests/test_onchange.py b/odoo/addons/test_new_api/tests/test_onchange.py
index 51f313616ac..5bffeae5f86 100644
--- a/odoo/addons/test_new_api/tests/test_onchange.py
+++ b/odoo/addons/test_new_api/tests/test_onchange.py
@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 
 from odoo.addons.base.tests.common import SavepointCaseWithUserDemo
 from odoo.tests import common
diff --git a/odoo/addons/test_populate/tests/test_populate.py b/odoo/addons/test_populate/tests/test_populate.py
index 09243fefdea..0a5c80d8025 100644
--- a/odoo/addons/test_populate/tests/test_populate.py
+++ b/odoo/addons/test_populate/tests/test_populate.py
@@ -5,10 +5,7 @@ import logging
 from odoo.tests import common
 from odoo.cli.populate import Populate
 from odoo.tools import mute_logger, populate
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 
 
 _logger = logging.getLogger(__name__)
@@ -154,4 +151,4 @@ class TestPopulateMissing(common.TransactionCase):
                 if no_factory_fields:
                     _logger.info('Model %s has some undefined field: %s', model._name, no_factory_fields)
 
-        _logger.info('No populate factories defiend for %s', no_factory_models)
\ No newline at end of file
+        _logger.info('No populate factories defiend for %s', no_factory_models)
diff --git a/odoo/fields.py b/odoo/fields.py
index 38dd2b8d833..2d38e9ff8e3 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -6,18 +6,12 @@
 from collections import defaultdict
 from datetime import date, datetime, time
 from operator import attrgetter
+from xmlrpc.client import MAXINT
 import itertools
 import logging
 import base64
 import binascii
 import pytz
-
-try:
-    from xmlrpc.client import MAXINT
-except ImportError:
-    #pylint: disable=bad-python3-import
-    from xmlrpclib import MAXINT
-
 import psycopg2
 
 from .tools import (
diff --git a/odoo/service/wsgi_server.py b/odoo/service/wsgi_server.py
index c29d91a2fbc..65ca8806df9 100644
--- a/odoo/service/wsgi_server.py
+++ b/odoo/service/wsgi_server.py
@@ -12,12 +12,7 @@ import sys
 import threading
 import traceback
 
-
-try:
-    from xmlrpc import client as xmlrpclib
-except ImportError:
-    # pylint: disable=bad-python3-import
-    import xmlrpclib
+from xmlrpc import client as xmlrpclib
 
 import werkzeug.exceptions
 import werkzeug.wrappers
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
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