From patchwork Wed Jun 20 14:12:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 08/14] fetch2: Simplify some looping constructs in uri_replace() Date: Wed, 20 Jun 2012 14:12:59 -0000 From: Richard Purdie X-Patchwork-Id: 30291 Message-Id: To: bitbake-devel@lists.openembedded.org Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5838436..fe0c6a7 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -191,8 +191,7 @@ def uri_replace(ud, uri_find, uri_replace, d): uri_replace_decoded = list(decodeurl(uri_replace)) logger.debug(2, "For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded)) result_decoded = ['', '', '', '', '', {}] - for i in uri_find_decoded: - loc = uri_find_decoded.index(i) + for loc, i in enumerate(uri_find_decoded): result_decoded[loc] = uri_decoded[loc] if isinstance(i, basestring): if (re.match(i, uri_decoded[loc])): @@ -200,7 +199,7 @@ def uri_replace(ud, uri_find, uri_replace, d): result_decoded[loc] = "" else: result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc]) - if uri_find_decoded.index(i) == 2: + if loc == 2: basename = None if ud.mirrortarball: basename = os.path.basename(ud.mirrortarball)