traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SF bug #1457411, fix errors using variables that don't exist. 

Rename file -> filename to be clear.

Will backport.
This commit is contained in:
Neal Norwitz 2006-03-24 05:36:33 +00:00
parent 51ef6f90af
commit 7fbb9d1174
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/scripts/byext.py
View File

@ -17,7 +17,7 @@ class Stats:
elif os.path.isfile(arg): elif os.path.isfile(arg):
self.statfile(arg) self.statfile(arg)
else: else:
sys.stderr.write("Can't find %s\n" % file) sys.stderr.write("Can't find %s\n" % arg)
self.addstats("<???>", "unknown", 1) self.addstats("<???>", "unknown", 1)
def statdir(self, dir): def statdir(self, dir):
@ -25,8 +25,8 @@ class Stats:
try: try:
names = os.listdir(dir) names = os.listdir(dir)
except os.error, err: except os.error, err:
sys.stderr.write("Can't list %s: %s\n" % (file, err)) sys.stderr.write("Can't list %s: %s\n" % (dir, err))
self.addstats(ext, "unlistable", 1) self.addstats("<dir>", "unlistable", 1)
return return
names.sort() names.sort()
for name in names: for name in names:
@ -42,9 +42,9 @@ class Stats:
else: else:
self.statfile(full) self.statfile(full)
def statfile(self, file): def statfile(self, filename):
head, ext = os.path.splitext(file) head, ext = os.path.splitext(filename)
head, base = os.path.split(file) head, base = os.path.split(filename)
if ext == base: if ext == base:
ext = "" # E.g. .cvsignore is deemed not to have an extension ext = "" # E.g. .cvsignore is deemed not to have an extension
ext = os.path.normcase(ext) ext = os.path.normcase(ext)
@ -52,9 +52,9 @@ class Stats:
ext = "<none>" ext = "<none>"
self.addstats(ext, "files", 1) self.addstats(ext, "files", 1)
try: try:
f = open(file, "rb") f = open(filename, "rb")
except IOError, err: except IOError, err:
sys.stderr.write("Can't open %s: %s\n" % (file, err)) sys.stderr.write("Can't open %s: %s\n" % (filename, err))
self.addstats(ext, "unopenable", 1) self.addstats(ext, "unopenable", 1)
return return
data = f.read() data = f.read()