From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 5 Mar 2009 05:08:00 +0000 (-0000)
Subject: Use enumerate() inside use_reduce() validation code.
X-Git-Tag: v2.2_rc24~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4097acb57e6f1f2c59907cb82eefeb6b6efa24ca;p=portage.git

Use enumerate() inside use_reduce() validation code.

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 48465ddbe..0bff1104c 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -216,8 +216,8 @@ def use_reduce(deparray, uselist=[], masklist=[], matchall=0, excludeall=[]):
 	@return: The use reduced depend array
 	"""
 	# Quick validity checks
-	for x in range(len(deparray)):
-		if deparray[x] in ["||","&&"]:
+	for x, y in enumerate(deparray):
+		if y == '||':
 			if len(deparray) - 1 == x or not isinstance(deparray[x+1], list):
 				raise portage.exception.InvalidDependString(deparray[x]+" missing atom list in \""+paren_enclose(deparray)+"\"")
 	if deparray and deparray[-1] and deparray[-1][-1] == "?":