From 642a997adee8f12ed640a03ead8fdd73ca0f6ab1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 May 2016 11:56:05 +0100 Subject: classes/lib: Update xrange -> range for python3 xrange() no longer exists in python 3, use range() (From OE-Core rev: d022b4335100612d6596cc4c4956cb98ed5873cc) Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 2 +- meta/lib/oe/recipeutils.py | 4 ++-- meta/recipes-core/meta/uninative-tarball.bb | 2 +- meta/recipes-rt/rt-tests/files/rt_bmark.py | 2 +- scripts/lib/devtool/standard.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index a0f82be4ab..30f2b507e1 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -187,7 +187,7 @@ def sysroot_checkhashes(covered, tasknames, fnids, fns, d, invalidtasks = None): problems = set() configurefnids = set() if not invalidtasks: - invalidtasks = xrange(len(tasknames)) + invalidtasks = range(len(tasknames)) for task in invalidtasks: if tasknames[task] == "do_configure" and task not in covered: configurefnids.add(fnids[task]) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 146fe83e18..632184fcd9 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -568,14 +568,14 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False, raise Exception('Invalid extralines value passed') def popline(varname): - for i in xrange(0, len(bbappendlines)): + for i in range(0, len(bbappendlines)): if bbappendlines[i][0] == varname: line = bbappendlines.pop(i) return line return None def appendline(varname, op, value): - for i in xrange(0, len(bbappendlines)): + for i in range(0, len(bbappendlines)): item = bbappendlines[i] if item[0] == varname: bbappendlines[i] = (item[0], item[1], item[2] + ' ' + value) diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index a983e42c67..fb147a17f7 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb @@ -50,7 +50,7 @@ fakeroot tar_sdk() { DEST="./${SDK_ARCH}-${SDK_OS}" mv sysroots/${SDK_SYS} $DEST rm sysroots -rf - patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} $DEST/usr/bin/patchelf + patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . } diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py index e2280e43e2..0e2b105e34 100755 --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py @@ -324,7 +324,7 @@ def run_cyclictest_suite(): t = time.time() max_list = [] - for i in xrange(0, suite_size): + for i in range(0, suite_size): tmp_min, tmp_avg, tmp_max = run_cyclictest_once() msg = "%2d/%2d:" % (i+1, suite_size) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 18847cf4ee..d6186b9ece 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -837,7 +837,7 @@ def _get_patchset_revs(args, srctree, recipe_path): stdout, _ = bb.process.run('git rev-list --reverse %s..HEAD' % initial_rev, cwd=srctree) newcommits = stdout.split() - for i in xrange(min(len(commits), len(newcommits))): + for i in range(min(len(commits), len(newcommits))): if newcommits[i] == commits[i]: update_rev = commits[i] @@ -863,7 +863,7 @@ def _remove_file_entries(srcuri, filelist): entries = [] for fname in filelist: basename = os.path.basename(fname) - for i in xrange(len(srcuri)): + for i in range(len(srcuri)): if (srcuri[i].startswith('file://') and os.path.basename(srcuri[i].split(';')[0]) == basename): entries.append(srcuri[i]) -- cgit v1.2.3-54-g00ecf