From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Aug 2010 03:06:11 +0000 (-0700)
Subject: Implement ExtendedAtomDict.iteritems(), so that it doesn't invoke
X-Git-Tag: v2.2_rc68~184
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3158c7762983e54bf83061d5fd6f3b656fb0c10a;p=portage.git

Implement ExtendedAtomDict.iteritems(), so that it doesn't invoke
the special __getitem__ behavior.
---

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 4b6c2d0b0..678a6271d 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -981,8 +981,15 @@ class ExtendedAtomDict(portage.cache.mappings.MutableMapping):
 		for k in self._extended:
 			yield k
 
+	def iteritems(self):
+		for item in self._normal.items():
+			yield item
+		for item in self._extended.items():
+			yield item
+
 	if sys.hexversion >= 0x3000000:
 		keys = __iter__
+		items = iteritems
 
 	def __len__(self):
 		return len(self._normal) + len(self._extended)