From e5145157dbdb9c2683d1ab8176641f19d2dc5d4e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Jun 2007 02:50:33 +0000 Subject: Implement iterkeys on top of __iter__ instead of vice versa. Thanks to Brian Harring for the suggestion. (trunk r6918) svn path=/main/branches/2.1.2/; revision=6934 --- pym/cache/metadata_overlay.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pym/cache/metadata_overlay.py') diff --git a/pym/cache/metadata_overlay.py b/pym/cache/metadata_overlay.py index d82ba96f8..d2a0b27fe 100644 --- a/pym/cache/metadata_overlay.py +++ b/pym/cache/metadata_overlay.py @@ -75,14 +75,14 @@ class database(template.database): return False return True - def iterkeys(self): + def __iter__(self): s = set() - for cpv in self.db_rw.iterkeys(): - if self.has_key(cpv): # validates whiteout when necessary + for cpv in self.db_rw: + if cpv in self: # validates whiteout when necessary yield cpv # set includes whiteouts so they won't be yielded later s.add(cpv) - for cpv in self.db_ro.iterkeys(): + for cpv in self.db_ro: if cpv not in s: yield cpv -- cgit v1.2.3-1-g7c22