diff options
Diffstat (limited to 'lib/portage/cache')
| -rw-r--r-- | lib/portage/cache/anydbm.py | 4 | ||||
| -rw-r--r-- | lib/portage/cache/mappings.py | 45 | ||||
| -rw-r--r-- | lib/portage/cache/sql_template.py | 5 | ||||
| -rw-r--r-- | lib/portage/cache/template.py | 12 |
4 files changed, 20 insertions, 46 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 >= 0x3000000: - 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 >= 0x3000000: - 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 >= 0x3000000: - 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 >= 0x3000000: - 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 >= 0x3000000: - 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 >= 0x3000000: - items = iteritems - keys = __iter__ - values = itervalues + items = iteritems + keys = __iter__ + values = itervalues v = SlotDict _slot_dict_classes[v.allowed_keys] = v diff --git a/lib/portage/cache/sql_template.py b/lib/portage/cache/sql_template.py index d023b1b5d..ba75a529f 100644 --- a/lib/portage/cache/sql_template.py +++ b/lib/portage/cache/sql_template.py @@ -296,6 +296,5 @@ class SQLDatabase(template.database): return [ row[0] for row in self.con.fetchall() ] - if sys.hexversion >= 0x3000000: - items = iteritems - keys = __iter__ + items = iteritems + keys = __iter__ diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py index d7fff3e32..e2dc3f088 100644 --- a/lib/portage/cache/template.py +++ b/lib/portage/cache/template.py @@ -171,9 +171,6 @@ class database(object): def has_key(self, cpv): return cpv in self - def keys(self): - return list(self) - def iterkeys(self): return iter(self) @@ -181,9 +178,6 @@ class database(object): for x in self: yield (x, self[x]) - def items(self): - return list(self.iteritems()) - def sync(self, rate=0): self.sync_rate = rate if(rate == 0): @@ -290,9 +284,9 @@ class database(object): if cont: yield cpv - if sys.hexversion >= 0x3000000: - keys = __iter__ - items = iteritems + keys = __iter__ + items = iteritems + _keysorter = operator.itemgetter(0) |