From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 21 Sep 2009 16:23:20 +0000 (-0000)
Subject: Fix infinite recursion in items and values methods.
X-Git-Tag: v2.2_rc42~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fefee145f7cf0672426ad76aaa244a7cfc88753;p=portage.git

Fix infinite recursion in items and values methods.

svn path=/main/trunk/; revision=14328
---

diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index 69e37fa15..ed1b04261 100644
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -52,10 +52,10 @@ class Mapping(object):
 			yield v
 
 	def values(self):
-		return [v for _, v in self.items()]
+		return [v for _, v in self.iteritems()]
 
 	def items(self):
-		return list(self.items())
+		return list(self.iteritems())
 
 	def get(self, key, default=None):
 		try:
@@ -353,14 +353,14 @@ def slot_dict_class(keys, prefix="_val_"):
 						pass
 
 			def items(self):
-				return list(self.items())
+				return list(self.iteritems())
 
 			def itervalues(self):
 				for k, v in self.items():
 					yield v
 
 			def values(self):
-				return list(self.values())
+				return list(self.itervalues())
 
 			def __delitem__(self, k):
 				try: