mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

SF patch 1631942 by Collin Winter:

Browse source 
(a) "except E, V" -> "except E as V"
(b) V is now limited to a simple name (local variable)
(c) V is now deleted at the end of the except block
This commit is contained in:
Guido van Rossum 2007-01-10 16:19:56 +00:00
parent 893523e80a
commit b940e113bf
295 changed files with 817 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Tools/scripts/byext.py
View file

@ -24,7 +24,7 @@ class Stats:
self.addstats("<dir>", "dirs", 1)
try:
names = os.listdir(dir)
except os.error, err:
except os.error as err:
sys.stderr.write("Can't list %s: %s\n" % (dir, err))
self.addstats("<dir>", "unlistable", 1)
return
@ -53,7 +53,7 @@ class Stats:
self.addstats(ext, "files", 1)
try:
f = open(filename, "rb")
except IOError, err:
except IOError as err:
sys.stderr.write("Can't open %s: %s\n" % (filename, err))
self.addstats(ext, "unopenable", 1)
return

2
Tools/scripts/byteyears.py
View file

@ -43,7 +43,7 @@ def main():
for filename in sys.argv[1:]:
try:
st = statfunc(filename)
except os.error, msg:
except os.error as msg:
sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
status = 1
st = ()

6
Tools/scripts/checkappend.py
View file

@ -50,7 +50,7 @@ def main():
global verbose
try:
opts, args = getopt.getopt(sys.argv[1:], "v")
except getopt.error, msg:
except getopt.error as msg:
errprint(str(msg) + "\n\n" + __doc__)
return
for opt, optarg in opts:
@ -77,7 +77,7 @@ def check(file):
try:
f = open(file)
except IOError, msg:
except IOError as msg:
errprint("%r: I/O Error: %s" % (file, msg))
return
@ -104,7 +104,7 @@ class AppendChecker:
def run(self):
try:
tokenize.tokenize(self.file.readline, self.tokeneater)
except tokenize.TokenError, msg:
except tokenize.TokenError as msg:
errprint("%r: Token Error: %s" % (self.fname, msg))
self.nerrors = self.nerrors + 1
return self.nerrors == 0

12
Tools/scripts/classfix.py
View file

@ -62,7 +62,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error, msg:
except os.error as msg:
err('%s: cannot list directory: %r\n' % (dirname, msg))
return 1
names.sort()
@ -83,7 +83,7 @@ def fix(filename):
## dbg('fix(%r)\n' % (filename,))
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
err('%s: cannot open: %r\n' % (filename, msg))
return 1
head, tail = os.path.split(filename)
@ -106,7 +106,7 @@ def fix(filename):
if g is None:
try:
g = open(tempname, 'w')
except IOError, msg:
except IOError as msg:
f.close()
err('%s: cannot create: %r\n' % (tempname, msg))
return 1
@ -130,17 +130,17 @@ def fix(filename):
try:
statbuf = os.stat(filename)
os.chmod(tempname, statbuf[ST_MODE] & 07777)
except os.error, msg:
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error, msg:
except os.error as msg:
err('%s: warning: backup failed (%r)\n' % (filename, msg))
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error, msg:
except os.error as msg:
err('%s: rename failed (%r)\n' % (filename, msg))
return 1
# Return succes

4
Tools/scripts/cleanfuture.py
View file

@ -59,7 +59,7 @@ def main():
global verbose, recurse, dryrun
try:
opts, args = getopt.getopt(sys.argv[1:], "drv")
except getopt.error, msg:
except getopt.error as msg:
errprint(msg)
return
for o, a in opts:
@ -92,7 +92,7 @@ def check(file):
print "checking", file, "...",
try:
f = open(file)
except IOError, msg:
except IOError as msg:
errprint("%r: I/O Error: %s" % (file, str(msg)))
return

2
Tools/scripts/cvsfiles.py
View file

@ -20,7 +20,7 @@ cutofftime = 0
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "n:")
except getopt.error, msg:
except getopt.error as msg:
print msg
print __doc__,
return 1

2
Tools/scripts/dutree.py
View file

@ -18,7 +18,7 @@ def main():
total, d = store(size, comps, total, d)
try:
display(total, d)
except IOError, e:
except IOError as e:
if e.errno != errno.EPIPE:
raise

6
Tools/scripts/finddiv.py
View file

@ -23,7 +23,7 @@ import tokenize
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "lh")
except getopt.error, msg:
except getopt.error as msg:
usage(msg)
return 2
if not args:
@ -52,7 +52,7 @@ def process(filename, listnames):
return processdir(filename, listnames)
try:
fp = open(filename)
except IOError, msg:
except IOError as msg:
sys.stderr.write("Can't open: %s\n" % msg)
return 1
g = tokenize.generate_tokens(fp.readline)
@ -70,7 +70,7 @@ def process(filename, listnames):
def processdir(dir, listnames):
try:
names = os.listdir(dir)
except os.error, msg:
except os.error as msg:
sys.stderr.write("Can't list directory: %s\n" % dir)
return 1
files = []

2
Tools/scripts/findlinksto.py
View file

@ -14,7 +14,7 @@ def main():
opts, args = getopt.getopt(sys.argv[1:], '')
if len(args) < 2:
raise getopt.GetoptError('not enough arguments', None)
except getopt.GetoptError, msg:
except getopt.GetoptError as msg:
sys.stdout = sys.stderr
print msg
print 'usage: findlinksto pattern directory ...'

2
Tools/scripts/findnocoding.py
View file

@ -78,7 +78,7 @@ usage = """Usage: %s [-cd] paths...
try:
opts, args = getopt.getopt(sys.argv[1:], 'cd')
except getopt.error, msg:
except getopt.error as msg:
print >>sys.stderr, msg
print >>sys.stderr, usage
sys.exit(1)

16
Tools/scripts/fixcid.py
View file

@ -62,7 +62,7 @@ def usage():
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], 'crs:')
except getopt.error, msg:
except getopt.error as msg:
err('Options error: ' + str(msg) + '\n')
usage()
sys.exit(2)
@ -97,7 +97,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error, msg:
except os.error as msg:
err(dirname + ': cannot list directory: ' + str(msg) + '\n')
return 1
names.sort()
@ -124,7 +124,7 @@ def fix(filename):
# File replacement mode
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
err(filename + ': cannot open: ' + str(msg) + '\n')
return 1
head, tail = os.path.split(filename)
@ -148,7 +148,7 @@ def fix(filename):
if g is None:
try:
g = open(tempname, 'w')
except IOError, msg:
except IOError as msg:
f.close()
err(tempname+': cannot create: '+
str(msg)+'\n')
@ -175,17 +175,17 @@ def fix(filename):
try:
statbuf = os.stat(filename)
os.chmod(tempname, statbuf[ST_MODE] & 07777)
except os.error, msg:
except os.error as msg:
err(tempname + ': warning: chmod failed (' + str(msg) + ')\n')
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error, msg:
except os.error as msg:
err(filename + ': warning: backup failed (' + str(msg) + ')\n')
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error, msg:
except os.error as msg:
err(filename + ': rename failed (' + str(msg) + ')\n')
return 1
# Return succes
@ -276,7 +276,7 @@ NotInComment = {}
def addsubst(substfile):
try:
fp = open(substfile, 'r')
except IOError, msg:
except IOError as msg:
err(substfile + ': cannot read substfile: ' + str(msg) + '\n')
sys.exit(1)
lineno = 0

6
Tools/scripts/fixdiv.py
View file

@ -140,7 +140,7 @@ multi_ok = 0
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "hm")
except getopt.error, msg:
except getopt.error as msg:
usage(msg)
return 2
for o, a in opts:
@ -181,7 +181,7 @@ def readwarnings(warningsfile):
prog = re.compile(PATTERN)
try:
f = open(warningsfile)
except IOError, msg:
except IOError as msg:
sys.stderr.write("can't open: %s\n" % msg)
return
warnings = {}
@ -207,7 +207,7 @@ def process(filename, list):
assert list # if this fails, readwarnings() is broken
try:
fp = open(filename)
except IOError, msg:
except IOError as msg:
sys.stderr.write("can't open: %s\n" % msg)
return 1
print "Index:", filename

4
Tools/scripts/fixheader.py
View file

@ -12,7 +12,7 @@ def main():
def process(filename):
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
sys.stderr.write('%s: can\'t open: %s\n' % (filename, str(msg)))
return
data = f.read()
@ -22,7 +22,7 @@ def process(filename):
return
try:
f = open(filename, 'w')
except IOError, msg:
except IOError as msg:
sys.stderr.write('%s: can\'t write: %s\n' % (filename, str(msg)))
return
sys.stderr.write('Processing %s ...\n' % filename)

2
Tools/scripts/fixnotice.py
View file

@ -62,7 +62,7 @@ def main():
opts, args = getopt.getopt(sys.argv[1:], 'hv',
['help', 'oldnotice=', 'newnotice=',
'dry-run', 'verbose'])
except getopt.error, msg:
except getopt.error as msg:
usage(1, msg)
for opt, arg in opts:

2
Tools/scripts/fixps.py
View file

@ -11,7 +11,7 @@ def main():
for filename in sys.argv[1:]:
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
print filename, ': can\'t open :', msg
continue
line = f.readline()

20
Tools/scripts/ftpmirror.py
View file

@ -45,7 +45,7 @@ def main():
global verbose, interactive, mac, rmok, nologin
try:
opts, args = getopt.getopt(sys.argv[1:], 'a:bil:mnp:qrs:v')
except getopt.error, msg:
except getopt.error as msg:
usage(msg)
login = ''
passwd = ''
@ -108,13 +108,13 @@ def mirrorsubdir(f, localdir):
if verbose: print 'Creating local directory', repr(localdir)
try:
makedir(localdir)
except os.error, msg:
except os.error as msg:
print "Failed to establish local directory", repr(localdir)
return
infofilename = os.path.join(localdir, '.mirrorinfo')
try:
text = open(infofilename, 'r').read()
except IOError, msg:
except IOError as msg:
text = '{}'
try:
info = eval(text)
@ -190,13 +190,13 @@ def mirrorsubdir(f, localdir):
print "Creating symlink %r -> %r" % (filename, linkto)
try:
os.symlink(linkto, tempname)
except IOError, msg:
except IOError as msg:
print "Can't create %r: %s" % (tempname, msg)
continue
else:
try:
fp = open(tempname, 'wb')
except IOError, msg:
except IOError as msg:
print "Can't create %r: %s" % (tempname, msg)
continue
if verbose:
@ -209,7 +209,7 @@ def mirrorsubdir(f, localdir):
try:
f.retrbinary('RETR ' + filename,
fp1.write, 8*1024)
except ftplib.error_perm, msg:
except ftplib.error_perm as msg:
print msg
t1 = time.time()
bytes = fp.tell()
@ -222,7 +222,7 @@ def mirrorsubdir(f, localdir):
pass # Ignore the error
try:
os.rename(tempname, fullname)
except os.error, msg:
except os.error as msg:
print "Can't rename %r to %r: %s" % (tempname, fullname, msg)
continue
info[filename] = infostuff
@ -292,7 +292,7 @@ def mirrorsubdir(f, localdir):
print 'Remote cwd', repr(subdir)
try:
f.cwd(subdir)
except ftplib.error_perm, msg:
except ftplib.error_perm as msg:
print "Can't chdir to", repr(subdir), ":", repr(msg)
else:
if verbose: print 'Mirroring as', repr(localsubdir)
@ -322,13 +322,13 @@ def remove(fullname):
return 0
try:
os.rmdir(fullname)
except os.error, msg:
except os.error as msg:
print "Can't remove local directory %r: %s" % (fullname, msg)
return 0
else:
try:
os.unlink(fullname)
except os.error, msg:
except os.error as msg:
print "Can't remove local file %r: %s" % (fullname, msg)
return 0
return 1

6
Tools/scripts/linktree.py
View file

@ -32,13 +32,13 @@ def main():
return 1
try:
os.mkdir(newtree, 0777)
except os.error, msg:
except os.error as msg:
print newtree + ': cannot mkdir:', msg
return 1
linkname = os.path.join(newtree, link)
try:
os.symlink(os.path.join(os.pardir, oldtree), linkname)
except os.error, msg:
except os.error as msg:
if not link_may_fail:
print linkname + ': cannot symlink:', msg
return 1
@ -51,7 +51,7 @@ def linknames(old, new, link):
if debug: print 'linknames', (old, new, link)
try:
names = os.listdir(old)
except os.error, msg:
except os.error as msg:
print old + ': warning: cannot listdir:', msg
return
for name in names:

2
Tools/scripts/logmerge.py
View file

@ -180,6 +180,6 @@ def format_output(database):
if __name__ == '__main__':
try:
main()
except IOError, e:
except IOError as e:
if e.errno != errno.EPIPE:
raise

6
Tools/scripts/md5sum.py
View file

@ -43,7 +43,7 @@ def sum(*files):
def printsum(filename, out=sys.stdout):
try:
fp = open(filename, rmode)
except IOError, msg:
except IOError as msg:
sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
return 1
if fnfilter:
@ -60,7 +60,7 @@ def printsumfp(fp, filename, out=sys.stdout):
if not data:
break
m.update(data)
except IOError, msg:
except IOError as msg:
sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
return 1
out.write('%s %s\n' % (m.hexdigest(), filename))
@ -70,7 +70,7 @@ def main(args = sys.argv[1:], out=sys.stdout):
global fnfilter, rmode, bufsize
try:
opts, args = getopt.getopt(args, 'blts:')
except getopt.error, msg:
except getopt.error as msg:
sys.stderr.write('%s: %s\n%s' % (sys.argv[0], msg, usage))
return 2
for o, a in opts:

12
Tools/scripts/methfix.py
View file

@ -59,7 +59,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error, msg:
except os.error as msg:
err('%s: cannot list directory: %r\n' % (dirname, msg))
return 1
names.sort()
@ -80,7 +80,7 @@ def fix(filename):
## dbg('fix(%r)\n' % (filename,))
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
err('%s: cannot open: %r\n' % (filename, msg))
return 1
head, tail = os.path.split(filename)
@ -117,7 +117,7 @@ def fix(filename):
if g is None:
try:
g = open(tempname, 'w')
except IOError, msg:
except IOError as msg:
f.close()
err('%s: cannot create: %r\n' % (tempname, msg))
return 1
@ -141,17 +141,17 @@ def fix(filename):
try:
statbuf = os.stat(filename)
os.chmod(tempname, statbuf[ST_MODE] & 07777)
except os.error, msg:
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error, msg:
except os.error as msg:
err('%s: warning: backup failed (%r)\n' % (filename, msg))
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error, msg:
except os.error as msg:
err('%s: rename failed (%r)\n' % (filename, msg))
return 1
# Return succes

4
Tools/scripts/ndiff.py
View file

@ -61,7 +61,7 @@ def fail(msg):
def fopen(fname):
try:
return open(fname, 'U')
except IOError, detail:
except IOError as detail:
return fail("couldn't open " + fname + ": " + str(detail))
# open two files & spray the diff to stdout; return false iff a problem
@ -85,7 +85,7 @@ def main(args):
import getopt
try:
opts, args = getopt.getopt(args, "qr:")
except getopt.error, detail:
except getopt.error as detail:
return fail(str(detail))
noisy = 1
qseen = rseen = 0

14
Tools/scripts/pathfix.py
View file

@ -37,7 +37,7 @@ def main():
sys.argv[0])
try:
opts, args = getopt.getopt(sys.argv[1:], 'i:')
except getopt.error, msg:
except getopt.error as msg:
err(msg + '\n')
err(usage)
sys.exit(2)
@ -68,7 +68,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error, msg:
except os.error as msg:
err('%s: cannot list directory: %r\n' % (dirname, msg))
return 1
names.sort()
@ -89,7 +89,7 @@ def fix(filename):
## dbg('fix(%r)\n' % (filename,))
try:
f = open(filename, 'r')
except IOError, msg:
except IOError as msg:
err('%s: cannot open: %r\n' % (filename, msg))
return 1
line = f.readline()
@ -102,7 +102,7 @@ def fix(filename):
tempname = os.path.join(head, '@' + tail)
try:
g = open(tempname, 'w')
except IOError, msg:
except IOError as msg:
f.close()
err('%s: cannot create: %r\n' % (tempname, msg))
return 1
@ -122,17 +122,17 @@ def fix(filename):
try:
statbuf = os.stat(filename)
os.chmod(tempname, statbuf[ST_MODE] & 07777)
except os.error, msg:
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error, msg:
except os.error as msg:
err('%s: warning: backup failed (%r)\n' % (filename, msg))
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error, msg:
except os.error as msg:
err('%s: rename failed (%r)\n' % (filename, msg))
return 1
# Return succes

2
Tools/scripts/pindent.py
View file

@ -491,7 +491,7 @@ def test():
import getopt
try:
opts, args = getopt.getopt(sys.argv[1:], 'cdrs:t:e')
except getopt.error, msg:
except getopt.error as msg:
sys.stderr.write('Error: %s\n' % msg)
sys.stderr.write(usage)
sys.exit(2)

6
Tools/scripts/pysource.py
View file

@ -33,7 +33,7 @@ def print_debug(msg):
def _open(fullpath):
try:
size = os.stat(fullpath).st_size
except OSError, err: # Permission denied - ignore the file
except OSError as err: # Permission denied - ignore the file
print_debug("%s: permission denied: %s" % (fullpath, err))
return None
@ -43,7 +43,7 @@ def _open(fullpath):
try:
return open(fullpath, 'rU')
except IOError, err: # Access denied, or a special file - ignore it
except IOError as err: # Access denied, or a special file - ignore it
print_debug("%s: access denied: %s" % (fullpath, err))
return None
@ -81,7 +81,7 @@ def can_be_compiled(fullpath):
try:
compile(code, fullpath, "exec")
except Exception, err:
except Exception as err:
print_debug("%s: cannot compile: %s" % (fullpath, err))
return False

2
Tools/scripts/redemo.py
View file

@ -104,7 +104,7 @@ class ReDemo:
self.getflags())
bg = self.promptdisplay['background']
self.statusdisplay.config(text="", background=bg)
except re.error, msg:
except re.error as msg:
self.compiled = None
self.statusdisplay.config(
text="re.error: %s" % str(msg),

4
Tools/scripts/reindent.py
View file

@ -61,7 +61,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "drvh",
["dryrun", "recurse", "verbose", "help"])
except getopt.error, msg:
except getopt.error as msg:
usage(msg)
return
for o, a in opts:
@ -99,7 +99,7 @@ def check(file):
print "checking", file, "...",
try:
f = open(file)
except IOError, msg:
except IOError as msg:
errprint("%s: I/O Error: %s" % (file, str(msg)))
return

4
Tools/scripts/rgrep.py
View file

@ -23,11 +23,11 @@ def main():
pattern, filename = args
try:
prog = re.compile(pattern, reflags)
except re.error, msg:
except re.error as msg:
usage("error in regular expression: %s" % str(msg))
try:
f = open(filename)
except IOError, msg:
except IOError as msg:
usage("can't open %s: %s" % (repr(filename), str(msg)), 1)
f.seek(0, 2)
pos = f.tell()

10
Tools/scripts/texi2html.py
View file

@ -554,7 +554,7 @@ class TexinfoParser:
file = os.path.join(self.includedir, file)
try:
fp = open(file, 'r')
except IOError, msg:
except IOError as msg:
print '*** Can\'t open include file', repr(file)
return
print '!'*self.debugging, '--> file', repr(file)
@ -1797,7 +1797,7 @@ class HTMLHelp:
print>>fp, ''
self.dumpfiles(fp)
fp.close()
except IOError, msg:
except IOError as msg:
print projectfile, ':', msg
sys.exit(1)
@ -1822,7 +1822,7 @@ class HTMLHelp:
print>>fp, '</BODY>'
print>>fp, '</HTML>'
fp.close()
except IOError, msg:
except IOError as msg:
print contentfile, ':', msg
sys.exit(1)
@ -1844,7 +1844,7 @@ class HTMLHelp:
print>>fp, '</BODY>'
print>>fp, '</HTML>'
fp.close()
except IOError, msg:
except IOError as msg:
print indexfile , ':', msg
sys.exit(1)
@ -2063,7 +2063,7 @@ def test():
try:
fp = open(file, 'r')
except IOError, msg:
except IOError as msg:
print file, ':', msg
sys.exit(1)

2
Tools/scripts/treesync.py
View file

@ -78,7 +78,7 @@ def process(slave, master):
print "creating slave directory", slave
try:
os.mkdir(slave)
except os.error, msg:
except os.error as msg:
print "can't make slave directory", slave, ":", msg
return
else:

4
Tools/scripts/untabify.py
View file

@ -12,7 +12,7 @@ def main():
opts, args = getopt.getopt(sys.argv[1:], "t:")
if not args:
raise getopt.error, "At least one file argument required"
except getopt.error, msg:
except getopt.error as msg:
print msg
print "usage:", sys.argv[0], "[-t tabwidth] file ..."
return
@ -28,7 +28,7 @@ def process(filename, tabsize):
f = open(filename)
text = f.read()
f.close()
except IOError, msg:
except IOError as msg:
print "%r: I/O error: %s" % (filename, msg)
return
newtext = text.expandtabs(tabsize)