From 5952928b42de348c91cc61c9615fbb49e9df4146 Mon Sep 17 00:00:00 2001 From: Adrian Torres Date: Tue, 4 Feb 2020 11:57:37 +0000 Subject: [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) --- setup/package.dfdebian | 1 - setup/package.dffedora | 1 - 2 files changed, 2 deletions(-) (limited to 'setup') diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 1caf6033aff..65e83d16b74 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -35,7 +35,6 @@ RUN apt-get update -qq && \ python3-libsass \ python3-lxml \ python3-mako \ - python3-mock \ python3-ofxparse \ python3-passlib \ python3-polib \ diff --git a/setup/package.dffedora b/setup/package.dffedora index ade6d8fece4..6d9075f851d 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -20,7 +20,6 @@ RUN dnf update -d 0 -e 0 -y && \ python3-lxml \ python3-mako \ python3-markupsafe \ - python3-mock \ python3-num2words \ python3-ofxparse \ python3-passlib \ -- cgit v1.2.3