From dbe76c6a138288980772d9b4a42280903df2daa9 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Mon, 21 Sep 2009 11:49:13 +0000
Subject: 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
---
 bin/emaint   | 3 +--
 bin/quickpkg | 3 +--
 bin/repoman  | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/emaint b/bin/emaint
index 52ed1f53b..407f8a66d 100755
--- a/bin/emaint
+++ b/bin/emaint
@@ -277,12 +277,11 @@ class MoveHandler(object):
 		maxval = len(cpv_all)
 		aux_update = self._tree.dbapi.aux_update
 		update_keys = self._update_keys
-		from itertools import izip
 		from portage.update import update_dbentries
 		if onProgress:
 			onProgress(maxval, 0)
 		for i, cpv in enumerate(cpv_all):
-			metadata = dict(izip(update_keys, aux_get(cpv, update_keys)))
+			metadata = dict(zip(update_keys, aux_get(cpv, update_keys)))
 			metadata_updates = update_dbentries(updates, metadata)
 			if metadata_updates:
 				errors.append("'%s' has outdated metadata" % cpv)
diff --git a/bin/quickpkg b/bin/quickpkg
index f885fff05..fd1728570 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -8,7 +8,6 @@ from __future__ import print_function
 import errno
 import signal
 import sys
-from itertools import izip
 
 try:
 	import portage
@@ -118,7 +117,7 @@ def quickpkg_main(options, args, eout):
 									return False
 						excluded_config_files.append(filename)
 						return True
-				existing_metadata = dict(izip(fix_metadata_keys,
+				existing_metadata = dict(zip(fix_metadata_keys,
 					vardb.aux_get(cpv, fix_metadata_keys)))
 				category, pf = portage.catsplit(cpv)
 				required_metadata = {}
diff --git a/bin/repoman b/bin/repoman
index 613e1ec14..330250258 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -27,7 +27,7 @@ import time
 import platform
 
 from io import StringIO
-from itertools import chain, izip
+from itertools import chain
 from stat import S_ISDIR, ST_CTIME
 
 if not hasattr(__builtins__, "set"):
@@ -947,7 +947,7 @@ for x in scanlist:
 			ebuildlist.append(pf)
 			cpv = "%s/%s" % (catdir, pf)
 			try:
-				myaux = dict(izip(allvars, portdb.aux_get(cpv, allvars)))
+				myaux = dict(zip(allvars, portdb.aux_get(cpv, allvars)))
 			except KeyError:
 				stats["ebuild.syntax"] += 1
 				fails["ebuild.syntax"].append(os.path.join(x, y))
-- 
cgit v1.2.3-1-g7c22