Re: [PATCH] Eliminate basestring/long/_unicode py3 compat
Zac Medico <[email protected]>
| Newsgroups | gmane.linux.gentoo.portage.devel |
|---|---|
| Message-ID | <[email protected]> |
On 7/14/20 11:07 PM, Michał Górny wrote: > Replace basestring and _unicode hacks with str, and long with int. > > Signed-off-by: Michał Górny <[email protected]> > --- > bin/egencache | 7 +-- > lib/_emerge/BinpkgFetcher.py | 5 +- > lib/_emerge/BlockerCache.py | 19 ++----- > lib/_emerge/BlockerDB.py | 4 +- > lib/_emerge/FakeVartree.py | 11 +--- > lib/_emerge/JobStatusDisplay.py | 7 +-- > lib/_emerge/Package.py | 27 ++++----- > lib/_emerge/Scheduler.py | 5 +- > lib/_emerge/actions.py | 21 +++---- > lib/_emerge/create_world_atom.py | 8 +-- > lib/_emerge/depgraph.py | 15 ++--- > lib/_emerge/main.py | 4 +- > lib/_emerge/resolver/output.py | 26 ++++----- > lib/_emerge/resolver/output_helpers.py | 6 +- > lib/_emerge/resolver/slot_collision.py | 6 +- > lib/portage/__init__.py | 12 ++-- > lib/portage/_emirrordist/MirrorDistTask.py | 7 +-- > lib/portage/_emirrordist/main.py | 9 +-- > lib/portage/_sets/base.py | 7 +-- > lib/portage/cache/flat_hash.py | 5 +- > lib/portage/cache/fs_template.py | 7 +-- > lib/portage/cache/index/pkg_desc_index.py | 10 +--- > lib/portage/cache/metadata.py | 8 +-- > lib/portage/cache/sqlite.py | 7 +-- > lib/portage/cache/template.py | 19 ++----- > lib/portage/cvstree.py | 3 - > lib/portage/dbapi/bintree.py | 55 ++++++++----------- > lib/portage/dbapi/porttree.py | 6 +- > lib/portage/dbapi/vartree.py | 33 +++++------ > lib/portage/dep/__init__.py | 50 +++++++---------- > lib/portage/eclass_cache.py | 10 +--- > lib/portage/elog/__init__.py | 5 +- > lib/portage/elog/mod_echo.py | 5 +- > lib/portage/elog/mod_syslog.py | 5 +- > lib/portage/emaint/modules/binhost/binhost.py | 9 +-- > lib/portage/emaint/modules/sync/sync.py | 9 +-- > lib/portage/exception.py | 9 +-- > lib/portage/getbinpkg.py | 5 +- > lib/portage/locks.py | 17 +++--- > lib/portage/mail.py | 7 +-- > lib/portage/manifest.py | 12 +--- > lib/portage/package/ebuild/config.py | 11 ++-- > lib/portage/package/ebuild/doebuild.py | 8 +-- > .../package/ebuild/getmaskingstatus.py | 7 +-- > lib/portage/process.py | 5 +- > lib/portage/proxy/lazyimport.py | 7 +-- > lib/portage/repository/config.py | 5 +- > lib/portage/sync/getaddrinfo_validate.py | 6 +- > lib/portage/sync/modules/rsync/rsync.py | 7 +-- > lib/portage/tests/dep/test_match_from_list.py | 7 +-- > .../tests/resolver/ResolverPlayground.py | 9 +-- > .../tests/unicode/test_string_format.py | 7 +-- > lib/portage/update.py | 16 ++---- > lib/portage/util/__init__.py | 8 +-- > lib/portage/util/_dyn_libs/LinkageMapELF.py | 6 +- > .../util/_dyn_libs/PreservedLibsRegistry.py | 7 +-- > lib/portage/util/_urlopen.py | 9 +-- > lib/portage/util/changelog.py | 10 ++-- > lib/portage/util/compression_probe.py | 4 +- > lib/portage/util/configparser.py | 9 +-- > lib/portage/util/env_update.py | 7 +-- > lib/portage/util/install_mask.py | 9 +-- > lib/portage/versions.py | 17 ++---- > lib/portage/xml/metadata.py | 12 ++-- > repoman/lib/repoman/__init__.py | 7 +-- > repoman/lib/repoman/main.py | 2 - > repoman/lib/repoman/metadata.py | 5 -- > .../modules/scan/metadata/ebuild_metadata.py | 5 +- > repoman/lib/repoman/utilities.py | 3 - > 69 files changed, 227 insertions(+), 490 deletions(-) Looks good. Please merge. -- Thanks, Zac
signature.asc
(application/pgp-signature, 981 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQKTBAEBCgB9FiEE8OgXaltWzqgSupCu0HX7jBBKPSAFAl8Pn45fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYw RTgxNzZBNUI1NkNFQTgxMkJBOTBBRUQwNzVGQjhDMTA0QTNEMjAACgkQ0HX7jBBK PSDa+w//fP/jDruOxohhjRaWVqtnzn70itaF9pawapYavPwrYLbp7pbLW57fhfkV eGoyckPwqWK1bdwzOui1rskaOWT+8ldVTOtglUuXGJS5NkwvEjUeSvKG2lgoWxUu 9p66pxwl8O9JGmBBmRGNYgybQ9olE6tEYcw7FuAGFM8tp6lyiKXuBamJx5RGVpTy xexQ9MUn2kTKCRGvnmBAVnJjNm9MgcRJgZhi631athxL5BMYEmID/QMBDmVzWuk6 kivqDW0S0IQv3Q4V7rNt/fHNPJ+GwK9Jt+/IwjyTVuhz0j6+SV1Iaa2QQ+DgGAjY uXmVpUxN5mFRktwrko+OYzjD95OikdRF3TgN2NCELwrofmaD5aL7QH9U5Tft7VpG Fpay8jxffSLTqifFrqQjdJE1RvbX9ivfqGk61kn/ElJOCZ86qP+iq6r/iDtorbu8 JECGxnOifKoZeW5JeoIkXq+uKaPbQAj9VmqGRtppT+Clpuc9BAG5ofdEeaOAzOBd N8LYo31M8x1zLEUIfrkExGuggNhiVnsGNKHZ1kCeIn+SatFKmCOc05pH/jrjNyWU XGATrOlF7cnMu1yXQ4mvq8oZXEYtBBgzBge9EBmI/LYNc7p1JtOXL/BbwWtCdvIA uOXM7Ar65e+5tqOybBOkBzCtffoK3lpVDbb0Ge9RlcmSvzeK4hQ= =qC/d -----END PGP SIGNATURE-----