Closes: https://github.com/gentoo/portage/pull/575
Signed-off-by: Michał Górny
---
lib/portage/cache/anydbm.py | 4 +-
lib/portage/cache/mappings.py | 45 +---
lib/portage/cache/sql_template.py | 5 +-
lib/portage/cache/template.py | 12 ++---
lib/portage/elog/messages.py | 3 +-
lib/portage/output.py | 3 +-
lib/portage/package/ebuild/config.py | 11 +---
.../futures/asyncio/test_subprocess_exec.py | 4 --
lib/portage/tests/util/futures/test_retry.py | 2 -
lib/portage/tests/util/test_socks5.py | 16 ++
lib/portage/util/__init__.py | 53 +--
lib/portage/util/_dyn_libs/NeededEntry.py | 10
lib/portage/util/digraph.py | 3 --
lib/portage/util/listdir.py | 2 -
lib/portage/util/whirlpool.py | 25 -
lib/portage/xpak.py | 2 -
16 files changed, 52 insertions(+), 148 deletions(-)
diff --git a/lib/portage/cache/anydbm.py b/lib/portage/cache/anydbm.py
index 88d85b0da..121a4eaf2 100644
--- a/lib/portage/cache/anydbm.py
+++ b/lib/portage/cache/anydbm.py
@@ -112,5 +112,5 @@ class database(fs_template.FsBased):
self.__db.sync()
self.__db.close()
- if sys.hexversion >= 0x300:
- items = iteritems
+ # TODO: do we need iteritems()?
+ items = iteritems
diff --git a/lib/portage/cache/mappings.py b/lib/portage/cache/mappings.py
index 0432fdf60..0adecde4a 100644
--- a/lib/portage/cache/mappings.py
+++ b/lib/portage/cache/mappings.py
@@ -25,9 +25,6 @@ class Mapping(object):
def __iter__(self):
return iter(self.keys())
- def keys(self):
- return list(self.__iter__())
-
def __contains__(self, key):
try:
value = self[key]
@@ -46,12 +43,6 @@ class Mapping(object):
for _, v in self.items():
yield v
- def values(self):
- return [v for _, v in self.iteritems()]
-
- def items(self):
- return list(self.iteritems())
-
def get(self, key, default=None):
try:
return self[key]
@@ -64,10 +55,10 @@ class Mapping(object):
def __len__(self):
return len(list(self))
- if sys.hexversion >= 0x300:
- items = iteritems
- keys = __iter__
- values = itervalues
+ # TODO: do we need to keep iter*?
+ items = iteritems
+ keys = __iter__
+ values = itervalues
class MutableMapping(Mapping):
"""
@@ -184,8 +175,8 @@ class UserDict(MutableMapping):
def clear(self):
self.data.clear()
- if sys.hexversion >= 0x300:
- keys = __iter__
+ keys = __iter__
+
class ProtectedDict(MutableMapping):
"""
@@ -234,8 +225,8 @@ class ProtectedDict(MutableMapping):
def __contains__(self, key):
return key in self.new or (key not in self.blacklist and key in
self.orig)
- if sys.hexversion >= 0x300:
- keys = __iter__
+ keys = __iter__
+
class LazyLoad(Mapping):
"""
@@ -271,8 +262,8 @@ class LazyLoad(Mapping):
self.pull = None
return key in self.d
- if sys.hexversion >= 0x300:
- keys = __iter__
+ keys = __iter__
+
_slot_dict_classes = weakref.WeakValueDictionary()
@@ -328,9 +319,6 @@ def slot_dict_class(keys, prefix="_val_"):
l += 1
return l
- def keys(self):
- return list(self)
-
def iteritems(self):
prefix = self._prefix
for k in self.allowed_keys:
@@ -339,16 +327,10 @@ def slot_dict_class(keys, prefix="_val_"):
except AttributeError:
pass
- def items(self):
- return list(self.iteritems())
-
def itervalues(self):
for k, v in self.iteritems():
yield v
- def values(self):
- return list(self.itervalues())
-
def __delitem__(self, k):
try:
delattr(self, self._prefix + k)
@@ -447,10 +429,9 @@ def slot_dict_class(keys, prefix="_val_"):
def __repr__(self):
return repr(dict(self.iteritems()))
- if sys.hexversion >=
