From 35b1511e59fceccff009fcae92fce3152bee1feb Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Mon, 21 Sep 2009 18:14:01 +0000
Subject: Use next(iterator) instead of iterator.next() for compatibility with
 Python 3. (2to3-3.1 -f next -nw ${FILES})

svn path=/main/trunk/; revision=14355
---
 pym/_emerge/BlockerDB.py     | 2 +-
 pym/_emerge/MetadataRegen.py | 2 +-
 pym/_emerge/depgraph.py      | 8 ++++----
 pym/_emerge/unmerge.py       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pym/_emerge')

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 1c4af1cae..8367ec651 100644
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -119,7 +119,7 @@ class BlockerDB(object):
 			blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms)
 			for inst_pkg in installed_pkgs:
 				try:
-					blocker_atoms.iterAtomsForPackage(inst_pkg).next()
+					next(blocker_atoms.iterAtomsForPackage(inst_pkg))
 				except (portage.exception.InvalidDependString, StopIteration):
 					continue
 				blocking_pkgs.add(inst_pkg)
diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py
index 88b157fd0..6bfd722c2 100644
--- a/pym/_emerge/MetadataRegen.py
+++ b/pym/_emerge/MetadataRegen.py
@@ -135,7 +135,7 @@ class MetadataRegen(PollScheduler):
 		"""
 		while self._can_add_job():
 			try:
-				metadata_process = self._process_iter.next()
+				metadata_process = next(self._process_iter)
 			except StopIteration:
 				return False
 
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d20016c90..72c31e303 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -747,7 +747,7 @@ class depgraph(object):
 			myarg = None
 			if dep.root == self._frozen_config.target_root:
 				try:
-					myarg = self._iter_atoms_for_pkg(dep_pkg).next()
+					myarg = next(self._iter_atoms_for_pkg(dep_pkg))
 				except StopIteration:
 					pass
 				except portage.exception.InvalidDependString:
@@ -1463,7 +1463,7 @@ class depgraph(object):
 						installed_cp_set = non_virtual_cps
 
 				if len(expanded_atoms) > 1 and len(installed_cp_set) == 1:
-					installed_cp = iter(installed_cp_set).next()
+					installed_cp = next(iter(installed_cp_set))
 					expanded_atoms = [atom for atom in expanded_atoms \
 						if atom.cp == installed_cp]
 
@@ -2280,7 +2280,7 @@ class depgraph(object):
 					myarg = None
 					if root == self._frozen_config.target_root:
 						try:
-							myarg = self._iter_atoms_for_pkg(pkg).next()
+							myarg = next(self._iter_atoms_for_pkg(pkg))
 						except StopIteration:
 							pass
 						except portage.exception.InvalidDependString:
@@ -4925,7 +4925,7 @@ class _dep_check_composite_db(portage.dbapi):
 	def _visible(self, pkg):
 		if pkg.installed and "selective" not in self._depgraph._dynamic_config.myparams:
 			try:
-				arg = self._depgraph._iter_atoms_for_pkg(pkg).next()
+				arg = next(self._depgraph._iter_atoms_for_pkg(pkg))
 			except (StopIteration, portage.exception.InvalidDependString):
 				arg = None
 			if arg:
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index ddcfa8180..b97207d68 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -404,7 +404,7 @@ def unmerge(root_config, myopts, unmerge_action,
 			selected = d["selected"]
 			if not selected:
 				continue
-			cp = portage.cpv_getkey(iter(selected).next())
+			cp = portage.cpv_getkey(next(iter(selected)))
 			cp_dict = unordered.get(cp)
 			if cp_dict is None:
 				cp_dict = {}
@@ -423,7 +423,7 @@ def unmerge(root_config, myopts, unmerge_action,
 			if mytype == "selected":
 				continue
 			mylist.difference_update(all_selected)
-		cp = portage.cpv_getkey(iter(selected).next())
+		cp = portage.cpv_getkey(next(iter(selected)))
 		for y in localtree.dep_match(cp):
 			if y not in pkgmap[x]["omitted"] and \
 				y not in pkgmap[x]["selected"] and \
-- 
cgit v1.2.3-1-g7c22