From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 Sep 2009 03:51:12 +0000 (-0000)
Subject: Fix 'iteritems' attribute detection to look for 'items' instead.
X-Git-Tag: v2.2_rc42~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5a17c830abc97a60378f61a92632a49cd647321;p=portage.git

Fix 'iteritems' attribute detection to look for 'items' instead.

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index e9bde27fb..90092eaa3 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -506,7 +506,7 @@ class portdbapi(dbapi):
 	def _metadata_callback(self, cpv, ebuild_path, repo_path, metadata, mtime):
 
 		i = metadata
-		if hasattr(metadata, "iteritems"):
+		if hasattr(metadata, "items"):
 			i = iter(metadata.items())
 		metadata = dict(i)