From bed98142e3e47ac2862ccf8fe3e4bdeabfc91172 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 2 Sep 2015 13:58:14 +0300 Subject: wic: fix pylint warning redefined-builtin Renamed variables named as Python builtin functions. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/lib/wic/engine.py') diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 30c4fa38dc..d4a7be6c3a 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -77,11 +77,11 @@ def find_canned_image(scripts_path, wks_file): for canned_wks_dir in layers_canned_wks_dir: for root, dirs, files in os.walk(canned_wks_dir): - for file in files: - if file.endswith("~") or file.endswith("#"): + for fname in files: + if fname.endswith("~") or fname.endswith("#"): continue - if file.endswith(".wks") and wks_file + ".wks" == file: - fullpath = os.path.join(canned_wks_dir, file) + if fname.endswith(".wks") and wks_file + ".wks" == fname: + fullpath = os.path.join(canned_wks_dir, fname) return fullpath return None @@ -94,11 +94,11 @@ def list_canned_images(scripts_path): for canned_wks_dir in layers_canned_wks_dir: for root, dirs, files in os.walk(canned_wks_dir): - for file in files: - if file.endswith("~") or file.endswith("#"): + for fname in files: + if fname.endswith("~") or fname.endswith("#"): continue - if file.endswith(".wks"): - fullpath = os.path.join(canned_wks_dir, file) + if fname.endswith(".wks"): + fullpath = os.path.join(canned_wks_dir, fname) f = open(fullpath, "r") lines = f.readlines() for line in lines: @@ -107,7 +107,7 @@ def list_canned_images(scripts_path): if idx != -1: desc = line[idx + len("short-description:"):].strip() break - basename = os.path.splitext(file)[0] + basename = os.path.splitext(fname)[0] print " %s\t\t%s" % (basename.ljust(30), desc) -- cgit v1.2.3