diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-09-22 20:43:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-09-22 20:43:34 +0000 |
| commit | 151192525a264e4bfdf92aee215045a5aaecab33 (patch) | |
| tree | afbf8cfd77355861c1a93a688dfef1d0d71d16f2 /pym/portage/cache/template.py | |
| parent | a60d0c7d4b7807bca6c18c11608fe42c6ca6c488 (diff) | |
| download | portage-151192525a264e4bfdf92aee215045a5aaecab33.tar.gz portage-151192525a264e4bfdf92aee215045a5aaecab33.tar.bz2 portage-151192525a264e4bfdf92aee215045a5aaecab33.zip | |
Replace dict.keys() usage with __iter__(), since it behaves identically in
both python 2.x and 3.x.
svn path=/main/trunk/; revision=14382
Diffstat (limited to 'pym/portage/cache/template.py')
| -rw-r--r-- | pym/portage/cache/template.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py index 9e779520b..3b003b1f6 100644 --- a/pym/portage/cache/template.py +++ b/pym/portage/cache/template.py @@ -68,8 +68,8 @@ class database(object): raise cache_errors.ReadOnlyRestriction() if self.cleanse_keys: d=ProtectedDict(values) - for k in list(d.keys()): - if d[k] == '': + for k, v in list(d.items()): + if not v: del d[k] if self.serialize_eclasses and "_eclasses_" in values: d["_eclasses_"] = serialize_eclasses(d["_eclasses_"]) @@ -110,13 +110,13 @@ class database(object): return cpv in self def keys(self): - return tuple(self.keys()) + return list(self) def iterkeys(self): return iter(self) def iteritems(self): - for x in self.keys(): + for x in self: yield (x, self[x]) def items(self): @@ -182,7 +182,7 @@ class database(object): if key not in self.__known_keys: raise InvalidRestriction(key, match, "Key isn't valid") - for cpv in self.keys(): + for cpv in self: cont = True vals = self[cpv] for key, match in restricts.items(): |