config: tweak mapping implementation more
authorZac Medico <zmedico@gentoo.org>
Fri, 18 Nov 2011 05:15:53 +0000 (21:15 -0800)
committerZac Medico <zmedico@gentoo.org>
Fri, 18 Nov 2011 05:15:53 +0000 (21:15 -0800)
pym/portage/package/ebuild/config.py

index b722a21a0c8338850ccf760e578fca30bee72b0d..835cd2385b1f64211c5d04aafa1a410f67c46b52 100644 (file)
@@ -2094,8 +2094,10 @@ class config(object):
                        return portage._pym_path
 
                for d in self.lookuplist:
-                       if mykey in d:
+                       try:
                                return d[mykey]
+                       except KeyError:
+                               pass
 
                raise KeyError(mykey)
 
@@ -2153,7 +2155,7 @@ class config(object):
 
        def iteritems(self):
                for k in self:
-                       yield (k, self[k])
+                       yield (k, self._getitem(k))
 
        def items(self):
                return list(self.iteritems())