diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-07-16 14:16:27 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-07-16 20:04:43 +0200 |
| commit | 8aaf817db51f0369095b0f7d93cdbecdfc32c869 (patch) | |
| tree | 93aba669b4382810b7f6a00de506ccce69f283e9 /lib/portage/_emirrordist | |
| parent | BinTestCase: export PORTAGE_PYTHON (diff) | |
| download | portage-8aaf817db51f0369095b0f7d93cdbecdfc32c869.tar.gz portage-8aaf817db51f0369095b0f7d93cdbecdfc32c869.tar.bz2 portage-8aaf817db51f0369095b0f7d93cdbecdfc32c869.zip | |
Eliminate the most of explicit py3 conditionals
Eliminate the most of py2/py3 conditions in the code. Leave a few
where the relevant code is unclear, they will be addressed later.
Reviewed-by: Zac Medico <zmedico@gentoo.org>
Closes: https://github.com/gentoo/portage/pull/574
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'lib/portage/_emirrordist')
| -rw-r--r-- | lib/portage/_emirrordist/Config.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/portage/_emirrordist/Config.py b/lib/portage/_emirrordist/Config.py index c1f59f725..d5dea7ab4 100644 --- a/lib/portage/_emirrordist/Config.py +++ b/lib/portage/_emirrordist/Config.py @@ -12,7 +12,6 @@ import portage from portage import os from portage.package.ebuild.fetch import MirrorLayoutConfig from portage.util import grabdict, grablines -from portage.util._ShelveUnicodeWrapper import ShelveUnicodeWrapper class Config(object): def __init__(self, options, portdb, event_loop): @@ -126,9 +125,6 @@ class Config(object): from bsddb3 import dbshelve db = dbshelve.open(db_file, flags=open_flag) - if sys.hexversion < 0x3000000: - db = ShelveUnicodeWrapper(db) - if self.options.dry_run: logging.warning("dry-run: %s db opened in readonly mode" % db_desc) if not isinstance(db, dict): |