| 1 |
On 7/14/20 11:07 PM, Michał Górny wrote: |
| 2 |
> Replace basestring and _unicode hacks with str, and long with int. |
| 3 |
> |
| 4 |
> Signed-off-by: Michał Górny <mgorny@g.o> |
| 5 |
> --- |
| 6 |
> bin/egencache | 7 +-- |
| 7 |
> lib/_emerge/BinpkgFetcher.py | 5 +- |
| 8 |
> lib/_emerge/BlockerCache.py | 19 ++----- |
| 9 |
> lib/_emerge/BlockerDB.py | 4 +- |
| 10 |
> lib/_emerge/FakeVartree.py | 11 +--- |
| 11 |
> lib/_emerge/JobStatusDisplay.py | 7 +-- |
| 12 |
> lib/_emerge/Package.py | 27 ++++----- |
| 13 |
> lib/_emerge/Scheduler.py | 5 +- |
| 14 |
> lib/_emerge/actions.py | 21 +++---- |
| 15 |
> lib/_emerge/create_world_atom.py | 8 +-- |
| 16 |
> lib/_emerge/depgraph.py | 15 ++--- |
| 17 |
> lib/_emerge/main.py | 4 +- |
| 18 |
> lib/_emerge/resolver/output.py | 26 ++++----- |
| 19 |
> lib/_emerge/resolver/output_helpers.py | 6 +- |
| 20 |
> lib/_emerge/resolver/slot_collision.py | 6 +- |
| 21 |
> lib/portage/__init__.py | 12 ++-- |
| 22 |
> lib/portage/_emirrordist/MirrorDistTask.py | 7 +-- |
| 23 |
> lib/portage/_emirrordist/main.py | 9 +-- |
| 24 |
> lib/portage/_sets/base.py | 7 +-- |
| 25 |
> lib/portage/cache/flat_hash.py | 5 +- |
| 26 |
> lib/portage/cache/fs_template.py | 7 +-- |
| 27 |
> lib/portage/cache/index/pkg_desc_index.py | 10 +--- |
| 28 |
> lib/portage/cache/metadata.py | 8 +-- |
| 29 |
> lib/portage/cache/sqlite.py | 7 +-- |
| 30 |
> lib/portage/cache/template.py | 19 ++----- |
| 31 |
> lib/portage/cvstree.py | 3 - |
| 32 |
> lib/portage/dbapi/bintree.py | 55 ++++++++----------- |
| 33 |
> lib/portage/dbapi/porttree.py | 6 +- |
| 34 |
> lib/portage/dbapi/vartree.py | 33 +++++------ |
| 35 |
> lib/portage/dep/__init__.py | 50 +++++++---------- |
| 36 |
> lib/portage/eclass_cache.py | 10 +--- |
| 37 |
> lib/portage/elog/__init__.py | 5 +- |
| 38 |
> lib/portage/elog/mod_echo.py | 5 +- |
| 39 |
> lib/portage/elog/mod_syslog.py | 5 +- |
| 40 |
> lib/portage/emaint/modules/binhost/binhost.py | 9 +-- |
| 41 |
> lib/portage/emaint/modules/sync/sync.py | 9 +-- |
| 42 |
> lib/portage/exception.py | 9 +-- |
| 43 |
> lib/portage/getbinpkg.py | 5 +- |
| 44 |
> lib/portage/locks.py | 17 +++--- |
| 45 |
> lib/portage/mail.py | 7 +-- |
| 46 |
> lib/portage/manifest.py | 12 +--- |
| 47 |
> lib/portage/package/ebuild/config.py | 11 ++-- |
| 48 |
> lib/portage/package/ebuild/doebuild.py | 8 +-- |
| 49 |
> .../package/ebuild/getmaskingstatus.py | 7 +-- |
| 50 |
> lib/portage/process.py | 5 +- |
| 51 |
> lib/portage/proxy/lazyimport.py | 7 +-- |
| 52 |
> lib/portage/repository/config.py | 5 +- |
| 53 |
> lib/portage/sync/getaddrinfo_validate.py | 6 +- |
| 54 |
> lib/portage/sync/modules/rsync/rsync.py | 7 +-- |
| 55 |
> lib/portage/tests/dep/test_match_from_list.py | 7 +-- |
| 56 |
> .../tests/resolver/ResolverPlayground.py | 9 +-- |
| 57 |
> .../tests/unicode/test_string_format.py | 7 +-- |
| 58 |
> lib/portage/update.py | 16 ++---- |
| 59 |
> lib/portage/util/__init__.py | 8 +-- |
| 60 |
> lib/portage/util/_dyn_libs/LinkageMapELF.py | 6 +- |
| 61 |
> .../util/_dyn_libs/PreservedLibsRegistry.py | 7 +-- |
| 62 |
> lib/portage/util/_urlopen.py | 9 +-- |
| 63 |
> lib/portage/util/changelog.py | 10 ++-- |
| 64 |
> lib/portage/util/compression_probe.py | 4 +- |
| 65 |
> lib/portage/util/configparser.py | 9 +-- |
| 66 |
> lib/portage/util/env_update.py | 7 +-- |
| 67 |
> lib/portage/util/install_mask.py | 9 +-- |
| 68 |
> lib/portage/versions.py | 17 ++---- |
| 69 |
> lib/portage/xml/metadata.py | 12 ++-- |
| 70 |
> repoman/lib/repoman/__init__.py | 7 +-- |
| 71 |
> repoman/lib/repoman/main.py | 2 - |
| 72 |
> repoman/lib/repoman/metadata.py | 5 -- |
| 73 |
> .../modules/scan/metadata/ebuild_metadata.py | 5 +- |
| 74 |
> repoman/lib/repoman/utilities.py | 3 - |
| 75 |
> 69 files changed, 227 insertions(+), 490 deletions(-) |
| 76 |
|
| 77 |
Looks good. Please merge. |
| 78 |
-- |
| 79 |
Thanks, |
| 80 |
Zac |
Archives