[dak/master] utils.py
remove a few "FOO shadows builtin" warnings.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
daklib/utils.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/daklib/utils.py b/daklib/utils.py
index 8307948..0d83b34 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -685,11 +685,11 @@ def regex_safe (s):
# Perform a substition of template
def TemplateSubst(map, filename):
- file = open_file(filename)
- template = file.read()
+ templatefile = open_file(filename)
+ template = templatefile.read()
for x in map.keys():
template = template.replace(x,map[x])
- file.close()
+ templatefile.close()
return template
################################################################################
@@ -785,13 +785,13 @@ def find_next_free (dest, too_many=100):
################################################################################
def result_join (original, sep = '\t'):
- list = []
+ resultlist = []
for i in xrange(len(original)):
if original[i] == None:
- list.append("")
+ resultlist.append("")
else:
- list.append(original[i])
- return sep.join(list)
+ resultlist.append(original[i])
+ return sep.join(resultlist)
################################################################################
--
1.5.6.5
Reply to: