Use filter() and zip() instead of itertools.ifilter() and itertools.izip() for compatibility with Python 3.

(2to3-3.1 -f itertools -f itertools_imports -nw ${FILES})

svn path=/main/trunk/; revision=14314

7 files changed, 15 insertions, 20 deletions

diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py
index 60b91edb8..07d993b7d 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -10,7 +10,6 @@ import portage
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
-from itertools import izip
 import fcntl
 import codecs
 
@@ -131,7 +130,7 @@ class EbuildMetadataPhase(SubProcess):
 				# number of lines is incorrect.
 				self.returncode = 1
 			else:
-				metadata = izip(portage.auxdbkeys, metadata_lines)
+				metadata = zip(portage.auxdbkeys, metadata_lines)
 				self.metadata = self.metadata_callback(self.cpv,
 					self.ebuild_path, self.repo_path, metadata,
 					self.ebuild_mtime)
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index e895cc86b..98d08891c 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from itertools import izip
 import portage
 from portage import os
 from _emerge.Package import Package
@@ -50,7 +49,7 @@ class FakeVartree(portage.vartree):
 				if pkg is not None:
 					metadata = pkg.metadata
 				else:
-					metadata = dict(izip(mykeys, real_dbapi.aux_get(cpv, mykeys)))
+					metadata = dict(zip(mykeys, real_dbapi.aux_get(cpv, mykeys)))
 				myslot = metadata["SLOT"]
 				mycp = portage.cpv_getkey(cpv)
 				myslot_atom = "%s:%s" % (mycp, myslot)
@@ -110,7 +109,7 @@ class FakeVartree(portage.vartree):
 		self._aux_get_history.add(pkg)
 		try:
 			# Use the live ebuild metadata if possible.
-			live_metadata = dict(izip(self._portdb_keys,
+			live_metadata = dict(zip(self._portdb_keys,
 				self._portdb.aux_get(pkg, self._portdb_keys)))
 			if not portage.eapi_is_supported(live_metadata["EAPI"]):
 				raise KeyError(pkg)
@@ -195,7 +194,7 @@ class FakeVartree(portage.vartree):
 		root_config = self._root_config
 		real_vardb = root_config.trees["vartree"].dbapi
 		pkg = Package(cpv=cpv, installed=True,
-			metadata=izip(self._db_keys,
+			metadata=zip(self._db_keys,
 			real_vardb.aux_get(cpv, self._db_keys)),
 			root_config=root_config,
 			type_name="installed")
@@ -224,7 +223,7 @@ def grab_global_updates(portdir):
 def perform_global_updates(mycpv, mydb, mycommands):
 	from portage.update import update_dbentries
 	aux_keys = ["DEPEND", "RDEPEND", "PDEPEND"]
-	aux_dict = dict(izip(aux_keys, mydb.aux_get(mycpv, aux_keys)))
+	aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys)))
 	updates = update_dbentries(mycommands, aux_dict)
 	if updates:
 		mydb.aux_update(mycpv, updates)
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 337a14f61..aa0a08475 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -10,7 +10,6 @@ import sys
 import textwrap
 import time
 import weakref
-from itertools import izip
 import portage
 from portage import os
 from portage import _encodings
@@ -1670,7 +1669,7 @@ class Scheduler(PollScheduler):
 		db = root_config.trees[tree_type].dbapi
 		db_keys = list(self.trees[root_config.root][
 			tree_type].dbapi._aux_cache_keys)
-		metadata = izip(db_keys, db.aux_get(cpv, db_keys))
+		metadata = zip(db_keys, db.aux_get(cpv, db_keys))
 		return Package(built=(type_name != 'ebuild'),
 			cpv=cpv, metadata=metadata,
 			root_config=root_config, installed=installed)
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 7366b82c7..5ac427d9f 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -19,7 +19,7 @@ import stat
 import sys
 import textwrap
 import time
-from itertools import chain, izip
+from itertools import chain
 
 import portage
 from portage import os
@@ -1364,9 +1364,9 @@ def action_info(settings, trees, myopts, myfiles):
 		out = EOutput()
 		for cpv in mypkgs:
 			# Get all package specific variables
-			metadata = dict(izip(auxkeys, vardb.aux_get(cpv, auxkeys)))
+			metadata = dict(zip(auxkeys, vardb.aux_get(cpv, auxkeys)))
 			pkg = Package(built=True, cpv=cpv,
-				installed=True, metadata=izip(Package.metadata_keys,
+				installed=True, metadata=zip(Package.metadata_keys,
 				(metadata.get(x, '') for x in Package.metadata_keys)),
 				root_config=root_config, type_name='installed')
 
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index b157d77c3..0585b9c28 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -9,7 +9,7 @@ import logging
 import re
 import sys
 import textwrap
-from itertools import chain, izip
+from itertools import chain
 
 import portage
 from portage import os
@@ -2538,7 +2538,7 @@ class depgraph(object):
 			db_keys = list(self._frozen_config._trees_orig[root_config.root][
 				tree_type].dbapi._aux_cache_keys)
 			try:
-				metadata = izip(db_keys, db.aux_get(cpv, db_keys))
+				metadata = zip(db_keys, db.aux_get(cpv, db_keys))
 			except KeyError:
 				raise portage.exception.PackageNotFound(cpv)
 			pkg = Package(built=(type_name != "ebuild"), cpv=cpv,
@@ -5140,7 +5140,7 @@ def get_mask_info(root_config, cpv, pkgsettings,
 	db, pkg_type, built, installed, db_keys):
 	eapi_masked = False
 	try:
-		metadata = dict(izip(db_keys,
+		metadata = dict(zip(db_keys,
 			db.aux_get(cpv, db_keys)))
 	except KeyError:
 		metadata = None
diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py
index 82c49b39c..355307972 100644
--- a/pym/_emerge/search.py
+++ b/pym/_emerge/search.py
@@ -5,7 +5,6 @@
 from __future__ import print_function
 
 import re
-from itertools import izip
 import portage
 from portage import os
 from portage.output import  bold, bold as white, darkgreen, green, red
@@ -142,7 +141,7 @@ class search(object):
 				else:
 					db_keys = list(db._aux_cache_keys)
 					for cpv in db.match(atom):
-						metadata = izip(db_keys,
+						metadata = zip(db_keys,
 							db.aux_get(cpv, db_keys))
 						if not self._visible(db, cpv, metadata):
 							continue
@@ -165,7 +164,7 @@ class search(object):
 					for cpv in reversed(db.match(atom)):
 						if portage.cpv_getkey(cpv) != cp:
 							continue
-						metadata = izip(db_keys,
+						metadata = zip(db_keys,
 							db.aux_get(cpv, db_keys))
 						if not self._visible(db, cpv, metadata):
 							continue
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index bb6224fe7..2ea77ab3b 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -7,7 +7,6 @@ from __future__ import print_function
 import logging
 import sys
 import textwrap
-from itertools import izip
 import portage
 from portage import os
 from portage.output import bold, colorize, darkgreen, green
@@ -42,7 +41,7 @@ def unmerge(root_config, myopts, unmerge_action,
 		pkg = pkg_cache.get(cpv)
 		if pkg is None:
 			pkg = Package(cpv=cpv, installed=True,
-				metadata=izip(db_keys, vartree.dbapi.aux_get(cpv, db_keys)),
+				metadata=zip(db_keys, vartree.dbapi.aux_get(cpv, db_keys)),
 				root_config=root_config,
 				type_name="installed")
 			pkg_cache[cpv] = pkg