diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-07-15 08:06:55 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-07-16 04:48:57 +0200 |
| commit | 5e9fe0f2a5afb71a2aa8425c33103c36bfc1a238 (patch) | |
| tree | 4ddb9b71c32439df7c58d35e95360a0ae85ce352 /lib/portage/util/_dyn_libs/LinkageMapELF.py | |
| parent | Remove from __future__ import unicode_literals (diff) | |
| download | portage-5e9fe0f2a5afb71a2aa8425c33103c36bfc1a238.tar.gz portage-5e9fe0f2a5afb71a2aa8425c33103c36bfc1a238.tar.bz2 portage-5e9fe0f2a5afb71a2aa8425c33103c36bfc1a238.zip | |
Eliminate basestring/long/_unicode py3 compat
Replace basestring and _unicode hacks with str, and long with int.
Reviewed-by: Zac Medico <zmedico@gentoo.org>
Closes: https://github.com/gentoo/portage/pull/570
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'lib/portage/util/_dyn_libs/LinkageMapELF.py')
| -rw-r--r-- | lib/portage/util/_dyn_libs/LinkageMapELF.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/portage/util/_dyn_libs/LinkageMapELF.py b/lib/portage/util/_dyn_libs/LinkageMapELF.py index 473a1243d..a3ec4fcc7 100644 --- a/lib/portage/util/_dyn_libs/LinkageMapELF.py +++ b/lib/portage/util/_dyn_libs/LinkageMapELF.py @@ -27,10 +27,6 @@ from portage.util import writemsg_level from portage.util._dyn_libs.NeededEntry import NeededEntry from portage.util.elf.header import ELFHeader -if sys.hexversion >= 0x3000000: - _unicode = str -else: - _unicode = unicode # Map ELF e_machine values from NEEDED.ELF.2 to approximate multilib # categories. This approximation will produce incorrect results on x32 @@ -333,7 +329,7 @@ class LinkageMapELF(object): entry.multilib_category = compute_multilib_category(elf_header) entry.filename = entry.filename[root_len:] owner = plibs.pop(entry.filename, None) - lines.append((owner, "scanelf", _unicode(entry))) + lines.append((owner, "scanelf", str(entry))) proc.wait() proc.stdout.close() |