| 1 |
On 7/16/20 5:18 AM, Michał Górny wrote: |
| 2 |
> Eliminate the most of py2/py3 conditions in the code. Leave a few |
| 3 |
> where the relevant code is unclear, they will be addressed later. |
| 4 |
> |
| 5 |
> Closes: https://github.com/gentoo/portage/pull/574 |
| 6 |
> Signed-off-by: Michał Górny <mgorny@g.o> |
| 7 |
> --- |
| 8 |
> bin/check-implicit-pointer-usage.py | 25 ++-------- |
| 9 |
> bin/chmod-lite.py | 11 ++--- |
| 10 |
> bin/dohtml.py | 11 ++--- |
| 11 |
> bin/doins.py | 7 ++- |
| 12 |
> bin/ebuild | 15 +----- |
| 13 |
> bin/filter-bash-environment.py | 11 ++--- |
| 14 |
> bin/install.py | 19 ++++--- |
| 15 |
> bin/pid-ns-init | 10 ++-- |
| 16 |
> bin/xattr-helper.py | 32 +++--------- |
| 17 |
> lib/_emerge/DependencyArg.py | 10 ---- |
| 18 |
> lib/_emerge/JobStatusDisplay.py | 4 +- |
| 19 |
> lib/_emerge/Package.py | 8 --- |
| 20 |
> lib/_emerge/PackageVirtualDbapi.py | 3 -- |
| 21 |
> lib/_emerge/SequentialTaskQueue.py | 3 -- |
| 22 |
> lib/_emerge/TaskSequence.py | 3 -- |
| 23 |
> lib/_emerge/UseFlagDisplay.py | 8 --- |
| 24 |
> lib/_emerge/UserQuery.py | 17 +++---- |
| 25 |
> lib/_emerge/actions.py | 2 - |
| 26 |
> lib/_emerge/resolver/DbapiProvidesIndex.py | 3 -- |
| 27 |
> lib/_emerge/resolver/output_helpers.py | 16 ------ |
| 28 |
> lib/_emerge/resolver/slot_collision.py | 8 --- |
| 29 |
> lib/portage/__init__.py | 49 +++++++------------ |
| 30 |
> lib/portage/_emirrordist/Config.py | 4 -- |
| 31 |
> lib/portage/_selinux.py | 12 ----- |
| 32 |
> lib/portage/_sets/base.py | 3 -- |
| 33 |
> lib/portage/dbapi/porttree.py | 7 +-- |
| 34 |
> lib/portage/dep/__init__.py | 18 +------ |
| 35 |
> lib/portage/dep/soname/SonameAtom.py | 8 --- |
| 36 |
> lib/portage/elog/mod_save_summary.py | 2 - |
| 37 |
> lib/portage/elog/mod_syslog.py | 4 -- |
| 38 |
> lib/portage/exception.py | 45 ++++------------- |
| 39 |
> lib/portage/mail.py | 49 +++---------------- |
| 40 |
> lib/portage/manifest.py | 7 --- |
| 41 |
> lib/portage/output.py | 4 +- |
| 42 |
> lib/portage/process.py | 16 +----- |
| 43 |
> lib/portage/proxy/objectproxy.py | 6 --- |
| 44 |
> lib/portage/repository/config.py | 6 --- |
| 45 |
> .../tests/unicode/test_string_format.py | 44 ++++------------- |
| 46 |
> lib/portage/util/_ShelveUnicodeWrapper.py | 45 ----------------- |
| 47 |
> 39 files changed, 102 insertions(+), 453 deletions(-) |
| 48 |
> delete mode 100644 lib/portage/util/_ShelveUnicodeWrapper.py |
| 49 |
|
| 50 |
Looks good. Please merge. |
| 51 |
-- |
| 52 |
Thanks, |
| 53 |
Zac |
Archives