Re: [PATCH] Eliminate the most of explicit py3 conditionals

Zac Medico <[email protected]> Thu, 16 Jul 2020 10:42:19 -0700
Newsgroups	gmane.linux.gentoo.portage.devel
Message-ID	<[email protected]>
On 7/16/20 5:18 AM, Michał Górny wrote:
> Eliminate the most of py2/py3 conditions in the code.  Leave a few
> where the relevant code is unclear, they will be addressed later.
> 
> Closes: https://github.com/gentoo/portage/pull/574
> Signed-off-by: Michał Górny <[email protected]>
> ---
>  bin/check-implicit-pointer-usage.py           | 25 ++--------
>  bin/chmod-lite.py                             | 11 ++---
>  bin/dohtml.py                                 | 11 ++---
>  bin/doins.py                                  |  7 ++-
>  bin/ebuild                                    | 15 +-----
>  bin/filter-bash-environment.py                | 11 ++---
>  bin/install.py                                | 19 ++++---
>  bin/pid-ns-init                               | 10 ++--
>  bin/xattr-helper.py                           | 32 +++---------
>  lib/_emerge/DependencyArg.py                  | 10 ----
>  lib/_emerge/JobStatusDisplay.py               |  4 +-
>  lib/_emerge/Package.py                        |  8 ---
>  lib/_emerge/PackageVirtualDbapi.py            |  3 --
>  lib/_emerge/SequentialTaskQueue.py            |  3 --
>  lib/_emerge/TaskSequence.py                   |  3 --
>  lib/_emerge/UseFlagDisplay.py                 |  8 ---
>  lib/_emerge/UserQuery.py                      | 17 +++----
>  lib/_emerge/actions.py                        |  2 -
>  lib/_emerge/resolver/DbapiProvidesIndex.py    |  3 --
>  lib/_emerge/resolver/output_helpers.py        | 16 ------
>  lib/_emerge/resolver/slot_collision.py        |  8 ---
>  lib/portage/__init__.py                       | 49 +++++++------------
>  lib/portage/_emirrordist/Config.py            |  4 --
>  lib/portage/_selinux.py                       | 12 -----
>  lib/portage/_sets/base.py                     |  3 --
>  lib/portage/dbapi/porttree.py                 |  7 +--
>  lib/portage/dep/__init__.py                   | 18 +------
>  lib/portage/dep/soname/SonameAtom.py          |  8 ---
>  lib/portage/elog/mod_save_summary.py          |  2 -
>  lib/portage/elog/mod_syslog.py                |  4 --
>  lib/portage/exception.py                      | 45 ++++-------------
>  lib/portage/mail.py                           | 49 +++----------------
>  lib/portage/manifest.py                       |  7 ---
>  lib/portage/output.py                         |  4 +-
>  lib/portage/process.py                        | 16 +-----
>  lib/portage/proxy/objectproxy.py              |  6 ---
>  lib/portage/repository/config.py              |  6 ---
>  .../tests/unicode/test_string_format.py       | 44 ++++-------------
>  lib/portage/util/_ShelveUnicodeWrapper.py     | 45 -----------------
>  39 files changed, 102 insertions(+), 453 deletions(-)
>  delete mode 100644 lib/portage/util/_ShelveUnicodeWrapper.py

Looks good. Please merge.
-- 
Thanks,
Zac
signature.asc (application/pgp-signature, 981 B)