ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 08:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

2
Lib/CGIHTTPServer.py
View file

@ -320,7 +320,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
sys.stdout = save_stdout
sys.stderr = save_stderr
os.chdir(save_cwd)
except SystemExit, sts:
except SystemExit as sts:
self.log_error("CGI script exit status %s", str(sts))
else:
self.log_message("CGI script exited OK")

2
Lib/ConfigParser.py
View file

@ -567,7 +567,7 @@ class ConfigParser(RawConfigParser):
value = self._KEYCRE.sub(self._interpolation_replace, value)
try:
value = value % vars
except KeyError, e:
except KeyError as e:
raise InterpolationMissingOptionError(
option, section, rawval, e[0])
else:

4
Lib/SimpleXMLRPCServer.py
View file

@ -259,7 +259,7 @@ class SimpleXMLRPCDispatcher:
response = (response,)
response = xmlrpclib.dumps(response, methodresponse=1,
allow_none=self.allow_none, encoding=self.encoding)
except Fault, fault:
except Fault as fault:
response = xmlrpclib.dumps(fault, allow_none=self.allow_none,
encoding=self.encoding)
except:
@ -359,7 +359,7 @@ class SimpleXMLRPCDispatcher:
# XXX A marshalling error in any response will fail the entire
# multicall. If someone cares they should fix this.
results.append([self._dispatch(method_name, params)])
except Fault, fault:
except Fault as fault:
results.append(
{'faultCode' : fault.faultCode,
'faultString' : fault.faultString}

2
Lib/_strptime.py
View file

@ -291,7 +291,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
format_regex = time_re.compile(format)
# KeyError raised when a bad format is found; can be specified as
# \\, in which case it was a stray % but with a space after it
except KeyError, err:
except KeyError as err:
bad_directive = err.args[0]
if bad_directive == "\\":
bad_directive = "%"

4
Lib/asynchat.py
View file

@ -87,7 +87,7 @@ class async_chat (asyncore.dispatcher):
try:
data = self.recv (self.ac_in_buffer_size)
except socket.error, why:
except socket.error as why:
self.handle_error()
return
@ -220,7 +220,7 @@ class async_chat (asyncore.dispatcher):
if num_sent:
self.ac_out_buffer = self.ac_out_buffer[num_sent:]
except socket.error, why:
except socket.error as why:
self.handle_error()
return

10
Lib/asyncore.py
View file

@ -119,7 +119,7 @@ def poll(timeout=0.0, map=None):
else:
try:
r, w, e = select.select(r, w, e, timeout)
except select.error, err:
except select.error as err:
if err[0] != EINTR:
raise
else:
@ -165,7 +165,7 @@ def poll2(timeout=0.0, map=None):
pollster.register(fd, flags)
try:
r = pollster.poll(timeout)
except select.error, err:
except select.error as err:
if err[0] != EINTR:
raise
r = []
@ -320,7 +320,7 @@ class dispatcher:
try:
conn, addr = self.socket.accept()
return conn, addr
except socket.error, why:
except socket.error as why:
if why[0] == EWOULDBLOCK:
pass
else:
@ -330,7 +330,7 @@ class dispatcher:
try:
result = self.socket.send(data)
return result
except socket.error, why:
except socket.error as why:
if why[0] == EWOULDBLOCK:
return 0
else:
@ -347,7 +347,7 @@ class dispatcher:
return ''
else:
return data
except socket.error, why:
except socket.error as why:
# winsock sometimes throws ENOTCONN
if why[0] in [ECONNRESET, ENOTCONN, ESHUTDOWN]:
self.handle_close()

4
Lib/base64.py
View file

@ -71,7 +71,7 @@ def b64decode(s, altchars=None):
s = _translate(s, {altchars[0]: '+', altchars[1]: '/'})
try:
return binascii.a2b_base64(s)
except binascii.Error, msg:
except binascii.Error as msg:
# Transform this exception for consistency
raise TypeError(msg)
@ -328,7 +328,7 @@ def test():
import sys, getopt
try:
opts, args = getopt.getopt(sys.argv[1:], 'deut')
except getopt.error, msg:
except getopt.error as msg:
sys.stdout = sys.stderr
print msg
print """usage: %s [-d|-e|-u|-t] [file|-]

20
Lib/bsddb/dbtables.py
View file

@ -260,7 +260,7 @@ class bsdTableDB :
txn.commit()
txn = None
except DBError, dberror:
except DBError as dberror:
if txn:
txn.abort()
raise TableDBError, dberror[1]
@ -338,7 +338,7 @@ class bsdTableDB :
txn = None
self.__load_column_info(table)
except DBError, dberror:
except DBError as dberror:
if txn:
txn.abort()
raise TableDBError, dberror[1]
@ -407,7 +407,7 @@ class bsdTableDB :
txn.commit()
txn = None
except DBError, dberror:
except DBError as dberror:
# WIBNI we could just abort the txn and re-raise the exception?
# But no, because TableDBError is not related to DBError via
# inheritance, so it would be backwards incompatible. Do the next
@ -466,7 +466,7 @@ class bsdTableDB :
txn.abort()
raise
except DBError, dberror:
except DBError as dberror:
raise TableDBError, dberror[1]
def Delete(self, table, conditions={}):
@ -502,11 +502,11 @@ class bsdTableDB :
pass
txn.commit()
txn = None
except DBError, dberror:
except DBError as dberror:
if txn:
txn.abort()
raise
except DBError, dberror:
except DBError as dberror:
raise TableDBError, dberror[1]
@ -526,7 +526,7 @@ class bsdTableDB :
if columns is None:
columns = self.__tablecolumns[table]
matching_rowids = self.__Select(table, columns, conditions)
except DBError, dberror:
except DBError as dberror:
raise TableDBError, dberror[1]
# return the matches as a list of dictionaries
return matching_rowids.values()
@ -616,7 +616,7 @@ class bsdTableDB :
key, data = cur.next()
except DBError, dberror:
except DBError as dberror:
if dberror[0] != DB_NOTFOUND:
raise
continue
@ -636,7 +636,7 @@ class bsdTableDB :
try:
rowdata[column] = self.db.get(
_data_key(table, column, rowid))
except DBError, dberror:
except DBError as dberror:
if dberror[0] != DB_NOTFOUND:
raise
rowdata[column] = None
@ -700,7 +700,7 @@ class bsdTableDB :
if table in self.__tablecolumns:
del self.__tablecolumns[table]
except DBError, dberror:
except DBError as dberror:
if txn:
txn.abort()
raise TableDBError, dberror[1]

22
Lib/bsddb/test/test_basics.py
View file

@ -58,7 +58,7 @@ class BasicTestCase(unittest.TestCase):
self.homeDir = homeDir
try:
shutil.rmtree(homeDir)
except OSError, e:
except OSError as e:
# unix returns ENOENT, windows returns ESRCH
if e.errno not in (errno.ENOENT, errno.ESRCH): raise
os.mkdir(homeDir)
@ -162,7 +162,7 @@ class BasicTestCase(unittest.TestCase):
# set_get_returns_none() to change it.
try:
d.delete('abcd')
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
else:
@ -181,7 +181,7 @@ class BasicTestCase(unittest.TestCase):
try:
d.put('abcd', 'this should fail', flags=db.DB_NOOVERWRITE)
except db.DBKeyExistError, val:
except db.DBKeyExistError as val:
assert val[0] == db.DB_KEYEXIST
if verbose: print val
else:
@ -313,7 +313,7 @@ class BasicTestCase(unittest.TestCase):
print rec
try:
rec = c.next()
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
@ -333,7 +333,7 @@ class BasicTestCase(unittest.TestCase):
print rec
try:
rec = c.prev()
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
@ -357,7 +357,7 @@ class BasicTestCase(unittest.TestCase):
try:
n = c.set('bad key')
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
else:
@ -371,7 +371,7 @@ class BasicTestCase(unittest.TestCase):
try:
n = c.get_both('0404', 'bad data')
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
if verbose: print val
else:
@ -399,7 +399,7 @@ class BasicTestCase(unittest.TestCase):
c.delete()
try:
rec = c.current()
except db.DBKeyEmptyError, val:
except db.DBKeyEmptyError as val:
if get_raises_error:
assert val[0] == db.DB_KEYEMPTY
if verbose: print val
@ -445,7 +445,7 @@ class BasicTestCase(unittest.TestCase):
method
# a bug may cause a NULL pointer dereference...
getattr(c, method)(*args)
except db.DBError, val:
except db.DBError as val:
assert val[0] == 0
if verbose: print val
else:
@ -730,7 +730,7 @@ class BasicTransactionTestCase(BasicTestCase):
txn.abort()
try:
txn.abort()
except db.DBError, e:
except db.DBError as e:
pass
else:
raise RuntimeError, "DBTxn.abort() called after DB_TXN no longer valid w/o an exception"
@ -739,7 +739,7 @@ class BasicTransactionTestCase(BasicTestCase):
txn.commit()
try:
txn.commit()
except db.DBError, e:
except db.DBError as e:
pass
else:
raise RuntimeError, "DBTxn.commit() called after DB_TXN no longer valid w/o an exception"

2
Lib/bsddb/test/test_compare.py
View file

@ -234,7 +234,7 @@ class BtreeExceptionsTestCase (AbstractBtreeKeyCompareTestCase):
self.db.set_bt_compare (my_compare)
assert False, "this set should fail"
except RuntimeError, msg:
except RuntimeError as msg:
pass
def test_suite ():

4
Lib/bsddb/test/test_pickle.py
View file

@ -11,7 +11,7 @@ import glob
try:
# For Pythons w/distutils pybsddb
from bsddb3 import db
except ImportError, e:
except ImportError as e:
# For Python 2.3
from bsddb import db
@ -47,7 +47,7 @@ class pickleTestCase(unittest.TestCase):
assert self.db['spam'] == 'eggs'
try:
self.db.put('spam', 'ham', flags=db.DB_NOOVERWRITE)
except db.DBError, egg:
except db.DBError as egg:
pickledEgg = pickle.dumps(egg)
#print repr(pickledEgg)
rottenEgg = pickle.loads(pickledEgg)

12
Lib/bsddb/test/test_recno.py
View file

@ -29,7 +29,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
def tearDown(self):
try:
os.remove(self.filename)
except OSError, e:
except OSError as e:
if e.errno != errno.EEXIST: raise
def test01_basic(self):
@ -63,7 +63,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try:
data = d[0] # This should raise a KeyError!?!?!
except db.DBInvalidArgError, val:
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
if verbose: print val
else:
@ -72,7 +72,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
# test that has_key raises DB exceptions (fixed in pybsddb 4.3.2)
try:
d.has_key(0)
except db.DBError, val:
except db.DBError as val:
pass
else:
self.fail("has_key did not raise a proper exception")
@ -86,7 +86,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try:
data = d.get(100)
except db.DBNotFoundError, val:
except db.DBNotFoundError as val:
if get_returns_none:
self.fail("unexpected exception")
else:
@ -177,7 +177,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try:
d.get(99)
except db.DBKeyEmptyError, val:
except db.DBKeyEmptyError as val:
if get_returns_none:
self.fail("unexpected DBKeyEmptyError exception")
else:
@ -267,7 +267,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try: # this one will fail
d.append('bad' * 20)
except db.DBInvalidArgError, val:
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
if verbose: print val
else:

10
Lib/bsddb/test/test_thread.py
View file

@ -57,7 +57,7 @@ class BaseThreadedTestCase(unittest.TestCase):
self.homeDir = homeDir
try:
os.mkdir(homeDir)
except OSError, e:
except OSError as e:
if e.errno != errno.EEXIST: raise
self.env = db.DBEnv()
self.setEnvOpts()
@ -247,7 +247,7 @@ class SimpleThreadedBase(BaseThreadedTestCase):
# flush them
try:
dbutils.DeadlockWrap(d.sync, max_retries=12)
except db.DBIncompleteError, val:
except db.DBIncompleteError as val:
if verbose:
print "could not complete sync()..."
@ -360,7 +360,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase):
print "%s: records %d - %d finished" % (name, start, x)
txn.commit()
finished = True
except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val:
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
txn.abort()
@ -398,7 +398,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase):
finished = True
if verbose:
print "%s: deleted records %s" % (name, recs)
except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val:
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
txn.abort()
@ -428,7 +428,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase):
c.close()
txn.commit()
finished = True
except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val:
except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val:
if verbose:
print "%s: Aborting transaction (%s)" % (name, val[1])
c.close()

2
Lib/cgi.py
View file

@ -982,7 +982,7 @@ def print_directory():
print "<H3>Current Working Directory:</H3>"
try:
pwd = os.getcwd()
except os.error, msg:
except os.error as msg:
print "os.error:", escape(str(msg))
else:
print escape(pwd)

4
Lib/codecs.py
View file

@ -13,7 +13,7 @@ import __builtin__, sys
try:
from _codecs import *
except ImportError, why:
except ImportError as why:
raise SystemError('Failed to load the builtin codecs: %s' % why)
__all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE",
@ -422,7 +422,7 @@ class StreamReader(Codec):
data = self.bytebuffer + newdata
try:
newchars, decodedbytes = self.decode(data, self.errors)
except UnicodeDecodeError, exc:
except UnicodeDecodeError as exc:
if firstline:
newchars, decodedbytes = self.decode(data[:exc.start], self.errors)
lines = newchars.splitlines(True)

10
Lib/codeop.py
View file

@ -80,18 +80,18 @@ def _maybe_compile(compiler, source, filename, symbol):
try:
code = compiler(source, filename, symbol)
except SyntaxError, err:
except SyntaxError as err:
pass
try:
code1 = compiler(source + "\n", filename, symbol)
except SyntaxError, err1:
pass
except SyntaxError as e:
err1 = e
try:
code2 = compiler(source + "\n\n", filename, symbol)
except SyntaxError, err2:
pass
except SyntaxError as e:
err2 = e
if code:
return code

6
Lib/compileall.py
View file

@ -65,12 +65,12 @@ def compile_dir(dir, maxlevels=10, ddir=None,
ok = py_compile.compile(fullname, None, dfile, True)
except KeyboardInterrupt:
raise KeyboardInterrupt
except py_compile.PyCompileError,err:
except py_compile.PyCompileError as err:
if quiet:
print 'Compiling', fullname, '...'
print err.msg
success = 0
except IOError, e:
except IOError as e:
print "Sorry", e
success = 0
else:
@ -109,7 +109,7 @@ def main():
import getopt
try:
opts, args = getopt.getopt(sys.argv[1:], 'lfqd:x:')
except getopt.error, msg:
except getopt.error as msg:
print msg
print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \
"[-x regexp] [directory ...]"

2
Lib/compiler/pycodegen.py
View file

@ -227,7 +227,7 @@ class CodeGenerator:
assert getattr(self, 'NameFinder')
assert getattr(self, 'FunctionGen')
assert getattr(self, 'ClassGen')
except AssertionError, msg:
except AssertionError as msg:
intro = "Bad class construction for %s" % self.__class__.__name__
raise AssertionError, intro

2
Lib/contextlib.py
View file

@ -28,7 +28,7 @@ class GeneratorContextManager(object):
try:
self.gen.throw(type, value, traceback)
raise RuntimeError("generator didn't stop after throw()")
except StopIteration, exc:
except StopIteration as exc:
# Suppress the exception *unless* it's the same exception that
# was passed to throw(). This prevents a StopIteration
# raised inside the "with" statement from being suppressed

2
Lib/csv.py
View file

@ -48,7 +48,7 @@ class Dialect:
def _validate(self):
try:
_Dialect(self)
except TypeError, e:
except TypeError as e:
# We do this for compatibility with py2.3
raise Error(str(e))

2
Lib/ctypes/macholib/dyld.py
View file

@ -148,7 +148,7 @@ def framework_find(fn, executable_path=None, env=None):
"""
try:
return dyld_find(fn, executable_path=executable_path, env=env)
except ValueError, e:
except ValueError as e:
pass
fmwk_index = fn.rfind('.framework')
if fmwk_index == -1:

4
Lib/ctypes/test/__init__.py
View file

@ -57,12 +57,12 @@ def get_tests(package, mask, verbosity):
for modname in find_package_modules(package, mask):
try:
mod = __import__(modname, globals(), locals(), ['*'])
except ResourceDenied, detail:
except ResourceDenied as detail:
skipped.append(modname)
if verbosity > 1:
print >> sys.stderr, "Skipped %s: %s" % (modname, detail)
continue
except Exception, detail:
except Exception as detail:
print >> sys.stderr, "Warning: could not import %s: %s" % (modname, detail)
continue
for name in dir(mod):

2
Lib/ctypes/test/test_bitfields.py
View file

@ -191,7 +191,7 @@ class BitFieldTest(unittest.TestCase):
def get_except(self, func, *args, **kw):
try:
func(*args, **kw)
except Exception, detail:
except Exception as detail:
return detail.__class__, str(detail)
def test_mixed_1(self):

6
Lib/ctypes/test/test_structures.py
View file

@ -313,7 +313,7 @@ class StructureTestCase(unittest.TestCase):
def get_except(self, func, *args):
try:
func(*args)
except Exception, detail:
except Exception as detail:
return detail.__class__, str(detail)
@ -388,7 +388,7 @@ class TestRecursiveStructure(unittest.TestCase):
try:
Recursive._fields_ = [("next", Recursive)]
except AttributeError, details:
except AttributeError as details:
self.failUnless("Structure or union cannot contain itself" in
str(details))
else:
@ -405,7 +405,7 @@ class TestRecursiveStructure(unittest.TestCase):
try:
Second._fields_ = [("first", First)]
except AttributeError, details:
except AttributeError as details:
self.failUnless("_fields_ is final" in
str(details))
else:

4
Lib/ctypes/util.py
View file

@ -60,12 +60,12 @@ elif os.name == "posix":
finally:
try:
os.unlink(outfile)
except OSError, e:
except OSError as e:
if e.errno != errno.ENOENT:
raise
try:
os.unlink(ccout)
except OSError, e:
except OSError as e:
if e.errno != errno.ENOENT:
raise
res = re.search(expr, trace)

2
Lib/dis.py
View file

@ -33,7 +33,7 @@ def dis(x=None):
print "Disassembly of %s:" % name
try:
dis(x1)
except TypeError, msg:
except TypeError as msg:
print "Sorry:", msg
print
elif hasattr(x, 'co_code'):

10
Lib/distutils/bcppcompiler.py
View file

@ -115,7 +115,7 @@ class BCPPCompiler(CCompiler) :
# This needs to be compiled to a .res file -- do it now.
try:
self.spawn (["brcc32", "-fo", obj, src])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
continue # the 'for' loop
@ -139,7 +139,7 @@ class BCPPCompiler(CCompiler) :
self.spawn ([self.cc] + compile_opts + pp_opts +
[input_opt, output_opt] +
extra_postargs + [src])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
return objects
@ -164,7 +164,7 @@ class BCPPCompiler(CCompiler) :
pass # XXX what goes here?
try:
self.spawn ([self.lib] + lib_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LibError, msg
else:
log.debug("skipping %s (up-to-date)", output_filename)
@ -298,7 +298,7 @@ class BCPPCompiler(CCompiler) :
self.mkpath (os.path.dirname (output_filename))
try:
self.spawn ([self.linker] + ld_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LinkError, msg
else:
@ -391,7 +391,7 @@ class BCPPCompiler(CCompiler) :
self.mkpath(os.path.dirname(output_file))
try:
self.spawn(pp_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
print msg
raise CompileError, msg

4
Lib/distutils/command/register.py
View file

@ -284,11 +284,11 @@ Your selection [default 1]: ''',
data = ''
try:
result = opener.open(req)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
if self.show_response:
data = e.fp.read()
result = e.code, e.msg
except urllib2.URLError, e:
except urllib2.URLError as e:
result = 500, str(e)
else:
if self.show_response:

2
Lib/distutils/command/sdist.py
View file

@ -333,7 +333,7 @@ class sdist (Command):
try:
self.filelist.process_template_line(line)
except DistutilsTemplateError, msg:
except DistutilsTemplateError as msg:
self.warn("%s, line %d: %s" % (template.filename,
template.current_line,
msg))

2
Lib/distutils/command/upload.py
View file

@ -184,7 +184,7 @@ class upload(Command):
http.putheader('Authorization', auth)
http.endheaders()
http.send(body)
except socket.error, e:
except socket.error as e:
self.announce(str(e), log.ERROR)
return

8
Lib/distutils/core.py
View file

@ -110,7 +110,7 @@ def setup (**attrs):
# (ie. everything except distclass) to initialize it
try:
_setup_distribution = dist = klass(attrs)
except DistutilsSetupError, msg:
except DistutilsSetupError as msg:
if 'name' not in attrs:
raise SystemExit, "error in %s setup command: %s" % \
(attrs['name'], msg)
@ -135,7 +135,7 @@ def setup (**attrs):
# fault, so turn them into SystemExit to suppress tracebacks.
try:
ok = dist.parse_command_line()
except DistutilsArgError, msg:
except DistutilsArgError as msg:
raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
if DEBUG:
@ -151,7 +151,7 @@ def setup (**attrs):
dist.run_commands()
except KeyboardInterrupt:
raise SystemExit, "interrupted"
except (IOError, os.error), exc:
except (IOError, os.error) as exc:
error = grok_environment_error(exc)
if DEBUG:
@ -161,7 +161,7 @@ def setup (**attrs):
raise SystemExit, error
except (DistutilsError,
CCompilerError), msg:
CCompilerError) as msg:
if DEBUG:
raise
else:

6
Lib/distutils/cygwinccompiler.py
View file

@ -142,13 +142,13 @@ class CygwinCCompiler (UnixCCompiler):
# gcc needs '.res' and '.rc' compiled to object files !!!
try:
self.spawn(["windres", "-i", src, "-o", obj])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
else: # for other files use the C-compiler
try:
self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
extra_postargs)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
def link (self,
@ -379,7 +379,7 @@ def check_config_h():
s = f.read()
f.close()
except IOError, exc:
except IOError as exc:
# if we can't read this file, we cannot say it is wrong
# the compiler will complain later about this file as missing
return (CONFIG_H_UNCERTAIN,

7
Lib/distutils/dir_util.py
View file

@ -75,7 +75,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
try:
os.mkdir(head)
created_dirs.append(head)
except OSError, exc:
except OSError as exc:
raise DistutilsFileError, \
"could not create '%s': %s" % (head, exc[-1])
@ -142,7 +142,8 @@ def copy_tree (src, dst,
"cannot copy tree '%s': not a directory" % src
try:
names = os.listdir(src)
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
if dry_run:
names = []
else:
@ -209,7 +210,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
abspath = os.path.abspath(cmd[1])
if abspath in _path_created:
del _path_created[abspath]
except (IOError, OSError), exc:
except (IOError, OSError) as exc:
log.warn(grok_environment_error(
exc, "error removing %s: " % directory))

6
Lib/distutils/dist.py
View file

@ -398,7 +398,7 @@ Common commands: (see '--help-commands' for more)
setattr(self, opt, strtobool(val))
else:
setattr(self, opt, val)
except ValueError, msg:
except ValueError as msg:
raise DistutilsOptionError, msg
# parse_config_files ()
@ -515,7 +515,7 @@ Common commands: (see '--help-commands' for more)
# it takes.
try:
cmd_class = self.get_command_class(command)
except DistutilsModuleError, msg:
except DistutilsModuleError as msg:
raise DistutilsArgError, msg
# Require that the command class be derived from Command -- want
@ -917,7 +917,7 @@ Common commands: (see '--help-commands' for more)
raise DistutilsOptionError, \
("error in %s: command '%s' has no such option '%s'"
% (source, command_name, option))
except ValueError, msg:
except ValueError as msg:
raise DistutilsOptionError, msg
def reinitialize_command (self, command, reinit_subcommands=0):

6
Lib/distutils/emxccompiler.py
View file

@ -79,13 +79,13 @@ class EMXCCompiler (UnixCCompiler):
# gcc requires '.rc' compiled to binary ('.res') files !!!
try:
self.spawn(["rc", "-r", src])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
else: # for other files use the C-compiler
try:
self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
extra_postargs)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
def link (self,
@ -275,7 +275,7 @@ def check_config_h():
s = f.read()
f.close()
except IOError, exc:
except IOError as exc:
# if we can't read this file, we cannot say it is wrong
# the compiler will complain later about this file as missing
return (CONFIG_H_UNCERTAIN,

2
Lib/distutils/fancy_getopt.py
View file

@ -256,7 +256,7 @@ class FancyGetopt:
short_opts = string.join(self.short_opts)
try:
opts, args = getopt.getopt(args, short_opts, self.long_opts)
except getopt.error, msg:
except getopt.error as msg:
raise DistutilsArgError, msg
for opt, val in opts:

23
Lib/distutils/file_util.py
View file

@ -32,27 +32,31 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
try:
try:
fsrc = open(src, 'rb')
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError, \
"could not open '%s': %s" % (src, errstr)
if os.path.exists(dst):
try:
os.unlink(dst)
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError, \
"could not delete '%s': %s" % (dst, errstr)
try:
fdst = open(dst, 'wb')
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError, \
"could not create '%s': %s" % (dst, errstr)
while 1:
try:
buf = fsrc.read(buffer_size)
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError, \
"could not read from '%s': %s" % (src, errstr)
@ -61,7 +65,8 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
try:
fdst.write(buf)
except os.error, (errno, errstr):
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError, \
"could not write to '%s': %s" % (dst, errstr)
@ -146,7 +151,7 @@ def copy_file (src, dst,
import macostools
try:
macostools.copy(src, dst, 0, preserve_times)
except os.error, exc:
except os.error as exc:
raise DistutilsFileError, \
"could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
@ -217,7 +222,8 @@ def move_file (src, dst,
copy_it = 0
try:
os.rename(src, dst)
except os.error, (num, msg):
except os.error as e:
(num, msg) = e
if num == errno.EXDEV:
copy_it = 1
else:
@ -228,7 +234,8 @@ def move_file (src, dst,
copy_file(src, dst)
try:
os.unlink(src)
except os.error, (num, msg):
except os.error as e:
(num, msg) = e
try:
os.unlink(dst)
except os.error:

12
Lib/distutils/msvccompiler.py
View file

@ -129,7 +129,7 @@ class MacroExpander:
self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
else:
self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
except KeyError, exc: #
except KeyError as exc: #
raise DistutilsPlatformError, \
("""Python was built with Visual Studio 2003;
extensions must be built with a compiler than can generate compatible binaries.
@ -371,7 +371,7 @@ class MSVCCompiler (CCompiler) :
try:
self.spawn ([self.rc] + pp_opts +
[output_opt] + [input_opt])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
continue
elif ext in self._mc_extensions:
@ -400,7 +400,7 @@ class MSVCCompiler (CCompiler) :
self.spawn ([self.rc] +
["/fo" + obj] + [rc_file])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
continue
else:
@ -414,7 +414,7 @@ class MSVCCompiler (CCompiler) :
self.spawn ([self.cc] + compile_opts + pp_opts +
[input_opt, output_opt] +
extra_postargs)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
return objects
@ -440,7 +440,7 @@ class MSVCCompiler (CCompiler) :
pass # XXX what goes here?
try:
self.spawn ([self.lib] + lib_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LibError, msg
else:
@ -519,7 +519,7 @@ class MSVCCompiler (CCompiler) :
self.mkpath (os.path.dirname (output_filename))
try:
self.spawn ([self.linker] + ld_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LinkError, msg
else:

8
Lib/distutils/spawn.py
View file

@ -78,7 +78,7 @@ def _spawn_nt (cmd,
# spawn for NT requires a full path to the .exe
try:
rc = os.spawnv(os.P_WAIT, executable, cmd)
except OSError, exc:
except OSError as exc:
# this seems to happen when the command isn't found
raise DistutilsExecError, \
"command '%s' failed: %s" % (cmd[0], exc[-1])
@ -103,7 +103,7 @@ def _spawn_os2 (cmd,
# spawnv for OS/2 EMX requires a full path to the .exe
try:
rc = os.spawnv(os.P_WAIT, executable, cmd)
except OSError, exc:
except OSError as exc:
# this seems to happen when the command isn't found
raise DistutilsExecError, \
"command '%s' failed: %s" % (cmd[0], exc[-1])
@ -131,7 +131,7 @@ def _spawn_posix (cmd,
#print "cmd[0] =", cmd[0]
#print "cmd =", cmd
exec_fn(cmd[0], cmd)
except OSError, e:
except OSError as e:
sys.stderr.write("unable to execute %s: %s\n" %
(cmd[0], e.strerror))
os._exit(1)
@ -146,7 +146,7 @@ def _spawn_posix (cmd,
while 1:
try:
(pid, status) = os.waitpid(pid, 0)
except OSError, exc:
except OSError as exc:
import errno
if exc.errno == errno.EINTR:
continue

4
Lib/distutils/sysconfig.py
View file

@ -344,7 +344,7 @@ def _init_posix():
try:
filename = get_makefile_filename()
parse_makefile(filename, g)
except IOError, msg:
except IOError as msg:
my_msg = "invalid Python installation: unable to open %s" % filename
if hasattr(msg, "strerror"):
my_msg = my_msg + " (%s)" % msg.strerror
@ -355,7 +355,7 @@ def _init_posix():
try:
filename = get_config_h_filename()
parse_config_h(open(filename), g)
except IOError, msg:
except IOError as msg:
my_msg = "invalid Python installation: unable to open %s" % filename
if hasattr(msg, "strerror"):
my_msg = my_msg + " (%s)" % msg.strerror

8
Lib/distutils/unixccompiler.py
View file

@ -162,7 +162,7 @@ class UnixCCompiler(CCompiler):
self.mkpath(os.path.dirname(output_file))
try:
self.spawn(pp_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
@ -172,7 +172,7 @@ class UnixCCompiler(CCompiler):
try:
self.spawn(compiler_so + cc_args + [src, '-o', obj] +
extra_postargs)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise CompileError, msg
def create_static_lib(self, objects, output_libname,
@ -196,7 +196,7 @@ class UnixCCompiler(CCompiler):
if self.ranlib:
try:
self.spawn(self.ranlib + [output_filename])
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LibError, msg
else:
log.debug("skipping %s (up-to-date)", output_filename)
@ -250,7 +250,7 @@ class UnixCCompiler(CCompiler):
linker = _darwin_compiler_fixup(linker, ld_args)
self.spawn(linker + ld_args)
except DistutilsExecError, msg:
except DistutilsExecError as msg:
raise LinkError, msg
else:
log.debug("skipping %s (up-to-date)", output_filename)

2
Lib/distutils/util.py
View file

@ -229,7 +229,7 @@ def subst_vars (s, local_vars):
try:
return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
except KeyError, var:
except KeyError as var:
raise ValueError, "invalid variable '$%s'" % var
# subst_vars ()

16
Lib/doctest.py
View file

@ -1604,8 +1604,8 @@ class DebugRunner(DocTestRunner):
... {}, 'foo', 'foo.py', 0)
>>> try:
... runner.run(test)
... except UnexpectedException, failure:
... pass
... except UnexpectedException as f:
... failure = f
>>> failure.test is test
True
@ -1632,8 +1632,8 @@ class DebugRunner(DocTestRunner):
>>> try:
... runner.run(test)
... except DocTestFailure, failure:
... pass
... except DocTestFailure as f:
... failure = f
DocTestFailure objects provide access to the test:
@ -2141,8 +2141,8 @@ class DocTestCase(unittest.TestCase):
>>> case = DocTestCase(test)
>>> try:
... case.debug()
... except UnexpectedException, failure:
... pass
... except UnexpectedException as f:
... failure = f
The UnexpectedException contains the test, the example, and
the original exception:
@ -2170,8 +2170,8 @@ class DocTestCase(unittest.TestCase):
>>> try:
... case.debug()
... except DocTestFailure, failure:
... pass
... except DocTestFailure as f:
... failure = f
DocTestFailure objects provide access to the test:

2
Lib/encodings/uu_codec.py
View file

@ -81,7 +81,7 @@ def uu_decode(input,errors='strict'):
break
try:
data = a2b_uu(s)
except binascii.Error, v:
except binascii.Error as v:
# Workaround for broken uuencoders by /Fredrik Lundh
nbytes = (((ord(s[0])-32) & 63) * 4 + 5) / 3
data = a2b_uu(s[:nbytes])

4
Lib/filecmp.py
View file

@ -148,12 +148,12 @@ class dircmp:
ok = 1
try:
a_stat = os.stat(a_path)
except os.error, why:
except os.error as why:
# print 'Can\'t stat', a_path, ':', why[1]
ok = 0
try:
b_stat = os.stat(b_path)
except os.error, why:
except os.error as why:
# print 'Can\'t stat', b_path, ':', why[1]
ok = 0

6
Lib/ftplib.py
View file

@ -119,7 +119,7 @@ class FTP:
try:
self.sock = socket.socket(af, socktype, proto)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.sock:
self.sock.close()
self.sock = None
@ -277,7 +277,7 @@ class FTP:
try:
sock = socket.socket(af, socktype, proto)
sock.bind(sa)
except socket.error, msg:
except socket.error as msg:
if sock:
sock.close()
sock = None
@ -496,7 +496,7 @@ class FTP:
if dirname == '..':
try:
return self.voidcmd('CDUP')
except error_perm, msg:
except error_perm as msg:
if msg.args[0][:3] != '500':
raise
elif dirname == '':

2
Lib/hotshot/stones.py
View file

@ -19,7 +19,7 @@ def main(logfile):
stats.sort_stats('time', 'calls')
try:
stats.print_stats(20)
except IOError, e:
except IOError as e:
if e.errno != errno.EPIPE:
raise

2
Lib/htmllib.py
View file

@ -463,7 +463,7 @@ def test(args = None):
else:
try:
f = open(file, 'r')
except IOError, msg:
except IOError as msg:
print file, ":", msg
sys.exit(1)

14
Lib/httplib.py
View file

@ -667,7 +667,7 @@ class HTTPConnection:
if self.debuglevel > 0:
print "connect: (%s, %s)" % (self.host, self.port)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.debuglevel > 0:
print 'connect fail:', (self.host, self.port)
if self.sock:
@ -713,7 +713,7 @@ class HTTPConnection:
data=str.read(blocksize)
else:
self.sock.sendall(str)
except socket.error, v:
except socket.error as v:
if v[0] == 32: # Broken pipe
self.close()
raise
@ -868,7 +868,7 @@ class HTTPConnection:
try:
self._send_request(method, url, body, headers)
except socket.error, v:
except socket.error as v:
# trap 'Broken pipe' if we're allowed to automatically reconnect
if v[0] != 32 or not self.auto_open:
raise
@ -890,7 +890,7 @@ class HTTPConnection:
thelen=None
try:
thelen=str(len(body))
except TypeError, te:
except TypeError as te:
# If this is a file-like object, try to
# fstat its file descriptor
import os
@ -1019,7 +1019,7 @@ class SSLFile(SharedSocketClient):
while True:
try:
buf = self._ssl.read(self._bufsize)
except socket.sslerror, err:
except socket.sslerror as err:
if (err[0] == socket.SSL_ERROR_WANT_READ
or err[0] == socket.SSL_ERROR_WANT_WRITE):
continue
@ -1027,7 +1027,7 @@ class SSLFile(SharedSocketClient):
or err[0] == socket.SSL_ERROR_EOF):
break
raise
except socket.error, err:
except socket.error as err:
if err[0] == errno.EINTR:
continue
if err[0] == errno.EBADF:
@ -1215,7 +1215,7 @@ class HTTP:
"""
try:
response = self._conn.getresponse()
except BadStatusLine, e:
except BadStatusLine as e:
### hmm. if getresponse() ever closes the socket on a bad request,
### then we are going to have problems with self.sock

2
Lib/idlelib/ClassBrowser.py
View file

@ -94,7 +94,7 @@ class ModuleBrowserTreeItem(TreeItem):
return []
try:
dict = pyclbr.readmodule_ex(name, [dir] + sys.path)
except ImportError, msg:
except ImportError as msg:
return []
items = []
self.classes = {}

2
Lib/idlelib/EditorWindow.py
View file

@ -505,7 +505,7 @@ class EditorWindow(object):
# XXX Ought to insert current file's directory in front of path
try:
(f, file, (suffix, mode, type)) = _find_module(name)
except (NameError, ImportError), msg:
except (NameError, ImportError) as msg:
tkMessageBox.showerror("Import error", str(msg), parent=self.text)
return
if type != imp.PY_SOURCE:

4
Lib/idlelib/GrepDialog.py
View file

@ -82,7 +82,7 @@ class GrepDialog(SearchDialogBase):
for fn in list:
try:
f = open(fn)
except IOError, msg:
except IOError as msg:
print msg
continue
lineno = 0
@ -110,7 +110,7 @@ class GrepDialog(SearchDialogBase):
def findfiles(self, dir, base, rec):
try:
names = os.listdir(dir or os.curdir)
except os.error, msg:
except os.error as msg:
print msg
return []
list = []

8
Lib/idlelib/IOBinding.py
View file

@ -246,7 +246,7 @@ class IOBinding:
f = open(filename,'rb')
chars = f.read()
f.close()
except IOError, msg:
except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
return False
@ -289,7 +289,7 @@ class IOBinding:
# Next look for coding specification
try:
enc = coding_spec(chars)
except LookupError, name:
except LookupError as name:
tkMessageBox.showerror(
title="Error loading the file",
message="The encoding '%s' is not known to this Python "\
@ -380,7 +380,7 @@ class IOBinding:
f.flush()
f.close()
return True
except IOError, msg:
except IOError as msg:
tkMessageBox.showerror("I/O Error", str(msg),
master=self.text)
return False
@ -400,7 +400,7 @@ class IOBinding:
try:
enc = coding_spec(chars)
failed = None
except LookupError, msg:
except LookupError as msg:
failed = msg
enc = None
if enc:

8
Lib/idlelib/PyShell.py
View file

@ -380,7 +380,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
try:
self.rpcclt = MyRPCClient(addr)
break
except socket.error, err:
except socket.error as err:
pass
else:
self.display_port_binding_error()
@ -389,7 +389,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
self.rpcclt.listening_sock.settimeout(10)
try:
self.rpcclt.accept()
except socket.timeout, err:
except socket.timeout as err:
self.display_no_subprocess_error()
return None
self.rpcclt.register("stdin", self.tkconsole)
@ -423,7 +423,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
self.spawn_subprocess()
try:
self.rpcclt.accept()
except socket.timeout, err:
except socket.timeout as err:
self.display_no_subprocess_error()
return None
self.transfer_path()
@ -1324,7 +1324,7 @@ def main():
startup = False
try:
opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
except getopt.error, msg:
except getopt.error as msg:
sys.stderr.write("Error: %s\n" % str(msg))
sys.stderr.write(usage_msg)
sys.exit(2)

6
Lib/idlelib/ScriptBinding.py
View file

@ -66,13 +66,13 @@ class ScriptBinding:
f = open(filename, 'r')
try:
tabnanny.process_tokens(tokenize.generate_tokens(f.readline))
except tokenize.TokenError, msg:
except tokenize.TokenError as msg:
msgtxt, (lineno, start) = msg
self.editwin.gotoline(lineno)
self.errorbox("Tabnanny Tokenizing Error",
"Token Error: %s" % msgtxt)
return False
except tabnanny.NannyNag, nag:
except tabnanny.NannyNag as nag:
# The error messages from tabnanny are too confusing...
self.editwin.gotoline(nag.get_lineno())
self.errorbox("Tab/space error", indent_message)
@ -97,7 +97,7 @@ class ScriptBinding:
try:
# If successful, return the compiled code
return compile(source, filename, "exec")
except (SyntaxError, OverflowError), err:
except (SyntaxError, OverflowError) as err:
try:
msg, (errorfilename, lineno, offset, line) = err
if not errorfilename:

2
Lib/idlelib/SearchEngine.py
View file

@ -66,7 +66,7 @@ class SearchEngine:
flags = flags | re.IGNORECASE
try:
prog = re.compile(pat, flags)
except re.error, what:
except re.error as what:
try:
msg, col = what
except:

2
Lib/idlelib/run.py
View file

@ -114,7 +114,7 @@ def manage_socket(address):
try:
server = MyRPCServer(address, MyHandler)
break
except socket.error, err:
except socket.error as err:
print>>sys.__stderr__,"IDLE Subprocess: socket error: "\
+ err[1] + ", retrying...."
else:

12
Lib/imaplib.py
View file

@ -845,7 +845,7 @@ class IMAP4:
try:
self.send('%s%s' % (data, CRLF))
except (socket.error, OSError), val:
except (socket.error, OSError) as val:
raise self.abort('socket error: %s' % val)
if literal is None:
@ -870,7 +870,7 @@ class IMAP4:
try:
self.send(literal)
self.send(CRLF)
except (socket.error, OSError), val:
except (socket.error, OSError) as val:
raise self.abort('socket error: %s' % val)
if not literator:
@ -883,9 +883,9 @@ class IMAP4:
self._check_bye()
try:
typ, data = self._get_tagged_response(tag)
except self.abort, val:
except self.abort as val:
raise self.abort('command: %s => %s' % (name, val))
except self.error, val:
except self.error as val:
raise self.error('command: %s => %s' % (name, val))
self._check_bye()
if typ == 'BAD':
@ -984,7 +984,7 @@ class IMAP4:
try:
self._get_response()
except self.abort, val:
except self.abort as val:
if __debug__:
if self.debug >= 1:
self.print_log()
@ -1402,7 +1402,7 @@ if __name__ == '__main__':
try:
optlist, args = getopt.getopt(sys.argv[1:], 'd:s:')
except getopt.error, val:
except getopt.error as val:
optlist, args = (), ()
stream_command = None

4
Lib/lib-tk/Tkinter.py
View file

@ -85,7 +85,7 @@ def _cnfmerge(cnfs):
for c in _flatten(cnfs):
try:
cnf.update(c)
except (AttributeError, TypeError), msg:
except (AttributeError, TypeError) as msg:
print "_cnfmerge: fallback due to:", msg
for k, v in c.items():
cnf[k] = v
@ -1401,7 +1401,7 @@ class CallWrapper:
if self.subst:
args = self.subst(*args)
return self.func(*args)
except SystemExit, msg:
except SystemExit as msg:
raise SystemExit, msg
except:
self.widget._report_exception()

4
Lib/linecache.py
View file

@ -78,7 +78,7 @@ def updatecache(filename, module_globals=None):
fullname = filename
try:
stat = os.stat(fullname)
except os.error, msg:
except os.error as msg:
basename = os.path.split(filename)[1]
# Try for a __loader__, if available
@ -128,7 +128,7 @@ def updatecache(filename, module_globals=None):
fp = open(fullname, 'rU')
lines = fp.readlines()
fp.close()
except IOError, msg:
except IOError as msg:
## print '*** Cannot open', fullname, ':', msg
return []
size, mtime = stat.st_size, stat.st_mtime

2
Lib/logging/config.py
View file

@ -288,7 +288,7 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT):
except:
traceback.print_exc()
os.remove(file)
except socket.error, e:
except socket.error as e:
if type(e.args) != types.TupleType:
raise
else:

28
Lib/mailbox.py
View file

@ -258,7 +258,7 @@ class Maildir(Mailbox):
os.remove(tmp_file.name)
else:
os.rename(tmp_file.name, dest)
except OSError, e:
except OSError as e:
os.remove(tmp_file.name)
if e.errno == errno.EEXIST:
raise ExternalClashError('Name clash with existing message: %s'
@ -280,7 +280,7 @@ class Maildir(Mailbox):
self.remove(key)
except KeyError:
pass
except OSError, e:
except OSError as e:
if e.errno != errno.ENOENT:
raise
@ -437,12 +437,12 @@ class Maildir(Mailbox):
path = os.path.join(self._path, 'tmp', uniq)
try:
os.stat(path)
except OSError, e:
except OSError as e:
if e.errno == errno.ENOENT:
Maildir._count += 1
try:
return _create_carefully(path)
except OSError, e:
except OSError as e:
if e.errno != errno.EEXIST:
raise
else:
@ -495,7 +495,7 @@ class _singlefileMailbox(Mailbox):
Mailbox.__init__(self, path, factory, create)
try:
f = open(self._path, 'rb+')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
if create:
f = open(self._path, 'wb+')
@ -605,7 +605,7 @@ class _singlefileMailbox(Mailbox):
self._file.close()
try:
os.rename(new_file.name, self._path)
except OSError, e:
except OSError as e:
if e.errno == errno.EEXIST or \
(os.name == 'os2' and e.errno == errno.EACCES):
os.remove(self._path)
@ -837,7 +837,7 @@ class MH(Mailbox):
path = os.path.join(self._path, str(key))
try:
f = open(path, 'rb+')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
raise KeyError('No message with key: %s' % key)
else:
@ -859,7 +859,7 @@ class MH(Mailbox):
path = os.path.join(self._path, str(key))
try:
f = open(path, 'rb+')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
raise KeyError('No message with key: %s' % key)
else:
@ -885,7 +885,7 @@ class MH(Mailbox):
f = open(os.path.join(self._path, str(key)), 'r+')
else:
f = open(os.path.join(self._path, str(key)), 'r')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
raise KeyError('No message with key: %s' % key)
else:
@ -912,7 +912,7 @@ class MH(Mailbox):
f = open(os.path.join(self._path, str(key)), 'r+')
else:
f = open(os.path.join(self._path, str(key)), 'r')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
raise KeyError('No message with key: %s' % key)
else:
@ -932,7 +932,7 @@ class MH(Mailbox):
"""Return a file-like representation or raise a KeyError."""
try:
f = open(os.path.join(self._path, str(key)), 'rb')
except IOError, e:
except IOError as e:
if e.errno == errno.ENOENT:
raise KeyError('No message with key: %s' % key)
else:
@ -1843,7 +1843,7 @@ def _lock_file(f, dotlock=True):
if fcntl:
try:
fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
except IOError, e:
except IOError as e:
if e.errno in (errno.EAGAIN, errno.EACCES):
raise ExternalClashError('lockf: lock unavailable: %s' %
f.name)
@ -1853,7 +1853,7 @@ def _lock_file(f, dotlock=True):
try:
pre_lock = _create_temporary(f.name + '.lock')
pre_lock.close()
except IOError, e:
except IOError as e:
if e.errno == errno.EACCES:
return # Without write access, just skip dotlocking.
else:
@ -1866,7 +1866,7 @@ def _lock_file(f, dotlock=True):
else:
os.rename(pre_lock.name, f.name + '.lock')
dotlock_done = True
except OSError, e:
except OSError as e:
if e.errno == errno.EEXIST or \
(os.name == 'os2' and e.errno == errno.EACCES):
os.remove(pre_lock.name)

10
Lib/mhlib.py
View file

@ -370,7 +370,7 @@ class Folder:
count = len(all)
try:
anchor = self._parseindex(head, all)
except Error, msg:
except Error as msg:
seqs = self.getsequences()
if not head in seqs:
if not msg:
@ -407,7 +407,7 @@ class Folder:
# Neither X:Y nor X-Y; must be a number or a (pseudo-)sequence
try:
n = self._parseindex(seq, all)
except Error, msg:
except Error as msg:
seqs = self.getsequences()
if not seq in seqs:
if not msg:
@ -471,7 +471,7 @@ class Folder:
pass
try:
os.rename(path, commapath)
except os.error, msg:
except os.error as msg:
errors.append(msg)
else:
deleted.append(n)
@ -499,7 +499,7 @@ class Folder:
try:
shutil.copy2(path, topath)
os.unlink(path)
except (IOError, os.error), msg:
except (IOError, os.error) as msg:
errors.append(msg)
try:
os.unlink(topath)
@ -989,7 +989,7 @@ def test():
'all'):
try:
do('f.parsesequence(%r)' % (seq,))
except Error, msg:
except Error as msg:
print "Error:", msg
stuff = os.popen("pick %r 2>/dev/null" % (seq,)).read()
list = map(int, stuff.split())

2
Lib/mimetypes.py
View file

@ -510,7 +510,7 @@ More than one type argument may be given.
try:
opts, args = getopt.getopt(sys.argv[1:], 'hle',
['help', 'lenient', 'extension'])
except getopt.error, msg:
except getopt.error as msg:
usage(1, msg)
strict = 1

6
Lib/modulefinder.py
View file

@ -317,7 +317,7 @@ class ModuleFinder:
return
try:
self.import_hook(name, caller, level=level)
except ImportError, msg:
except ImportError as msg:
self.msg(2, "ImportError:", str(msg))
self._add_badmodule(name, caller)
else:
@ -328,7 +328,7 @@ class ModuleFinder:
continue
try:
self.import_hook(name, caller, [sub], level=level)
except ImportError, msg:
except ImportError as msg:
self.msg(2, "ImportError:", str(msg))
fullname = name + "." + sub
self._add_badmodule(fullname, caller)
@ -602,7 +602,7 @@ def test():
import getopt
try:
opts, args = getopt.getopt(sys.argv[1:], "dmp:qx:")
except getopt.error, msg:
except getopt.error as msg:
print msg
return

2
Lib/msilib/__init__.py
View file

@ -111,7 +111,7 @@ def add_data(db, table, values):
raise TypeError, "Unsupported type %s" % field.__class__.__name__
try:
v.Modify(MSIMODIFY_INSERT, r)
except Exception, e:
except Exception as e:
raise MSIError("Could not insert "+repr(values)+" into "+table)
r.ClearData()

2
Lib/nntplib.py
View file

@ -127,7 +127,7 @@ class NNTP:
except NNTPPermanentError:
# error 500, probably 'not implemented'
pass
except NNTPTemporaryError, e:
except NNTPTemporaryError as e:
if user and e.response[:3] == '480':
# Need authorization before 'mode reader'
readermode_afterauth = 1

2
Lib/optparse.py
View file

@ -1376,7 +1376,7 @@ class OptionParser (OptionContainer):
try:
stop = self._process_args(largs, rargs, values)
except (BadOptionError, OptionValueError), err:
except (BadOptionError, OptionValueError) as err:
self.error(str(err))
args = largs + rargs

6
Lib/os.py
View file

@ -163,7 +163,7 @@ def makedirs(name, mode=0777):
if head and tail and not path.exists(head):
try:
makedirs(head, mode)
except OSError, e:
except OSError as e:
# be happy if someone already created the path
if e.errno != EEXIST:
raise
@ -284,7 +284,7 @@ def walk(top, topdown=True, onerror=None):
# Note that listdir and error are globals in this module due
# to earlier import-*.
names = listdir(top)
except error, err:
except error as err:
if onerror is not None:
onerror(err)
return
@ -390,7 +390,7 @@ def _execvpe(file, args, env=None):
fullname = path.join(dir, file)
try:
func(fullname, *argrest)
except error, e:
except error as e:
tb = sys.exc_info()[2]
if (e.errno != ENOENT and e.errno != ENOTDIR
and saved_exc is None):

4
Lib/pdb.py
View file

@ -330,7 +330,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
arg = arg[colon+1:].lstrip()
try:
lineno = int(arg)
except ValueError, msg:
except ValueError as msg:
print >>self.stdout, '*** Bad lineno:', arg
return
else:
@ -618,7 +618,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
self.curframe.f_lineno = arg
self.stack[self.curindex] = self.stack[self.curindex][0], arg
self.print_stack_entry(self.stack[self.curindex])
except ValueError, e:
except ValueError as e:
print >>self.stdout, '*** Jump failed:', e
do_j = do_jump

4
Lib/pickle.py
View file

@ -816,7 +816,7 @@ class Unpickler:
while 1:
key = read(1)
dispatch[key](self)
except _Stop, stopinst:
except _Stop as stopinst:
return stopinst.value
# Return largest index k such that self.stack[k] is self.mark.
@ -1018,7 +1018,7 @@ class Unpickler:
if not instantiated:
try:
value = klass(*args)
except TypeError, err:
except TypeError as err:
raise TypeError, "in constructor for %s: %s" % (
klass.__name__, str(err)), sys.exc_info()[2]
self.append(value)

2
Lib/pkgutil.py
View file

@ -532,7 +532,7 @@ def extend_path(path, name):
if os.path.isfile(pkgfile):
try:
f = open(pkgfile)
except IOError, msg:
except IOError as msg:
sys.stderr.write("Can't open %s: %s\n" %
(pkgfile, msg))
else:

2
Lib/plat-irix5/torgb.py
View file

@ -80,7 +80,7 @@ def _torgb(filename, temps):
fname = filename
try:
ftype = imghdr.what(fname)
except IOError, msg:
except IOError as msg:
if type(msg) == type(()) and len(msg) == 2 and \
type(msg[0]) == type(0) and type(msg[1]) == type(''):
msg = msg[1]

2
Lib/plat-irix6/torgb.py
View file

@ -80,7 +80,7 @@ def _torgb(filename, temps):
fname = filename
try:
ftype = imghdr.what(fname)
except IOError, msg:
except IOError as msg:
if type(msg) == type(()) and len(msg) == 2 and \
type(msg[0]) == type(0) and type(msg[1]) == type(''):
msg = msg[1]

6
Lib/plat-mac/EasyDialogs.py
View file

@ -651,7 +651,7 @@ def AskFileForOpen(
try:
rr = Nav.NavChooseFile(args)
good = 1
except Nav.error, arg:
except Nav.error as arg:
if arg[0] != -128: # userCancelledErr
raise Nav.error, arg
return None
@ -704,7 +704,7 @@ def AskFileForSave(
try:
rr = Nav.NavPutFile(args)
good = 1
except Nav.error, arg:
except Nav.error as arg:
if arg[0] != -128: # userCancelledErr
raise Nav.error, arg
return None
@ -764,7 +764,7 @@ def AskFolder(
try:
rr = Nav.NavChooseFolder(args)
good = 1
except Nav.error, arg:
except Nav.error as arg:
if arg[0] != -128: # userCancelledErr
raise Nav.error, arg
return None

2
Lib/plat-mac/MiniAEFrame.py
View file

@ -70,7 +70,7 @@ class MiniApplication:
msg = "High Level Event: %r %r" % (code(message), code(h | (v<<16)))
try:
AE.AEProcessAppleEvent(event)
except AE.Error, err:
except AE.Error as err:
print 'AE error: ', err
print 'in', msg
traceback.print_exc()

4
Lib/plat-mac/aetools.py
View file

@ -57,7 +57,7 @@ aekeywords = [
def missed(ae):
try:
desc = ae.AEGetAttributeDesc('miss', 'keyw')
except AE.Error, msg:
except AE.Error as msg:
return None
return desc.data
@ -86,7 +86,7 @@ def unpackevent(ae, formodulename=""):
for key in aekeywords:
try:
desc = ae.AEGetAttributeDesc(key, '****')
except (AE.Error, MacOS.Error), msg:
except (AE.Error, MacOS.Error) as msg:
if msg[0] != -1701 and msg[0] != -1704:
raise
continue

4
Lib/plat-mac/applesingle.py
View file

@ -48,7 +48,7 @@ class AppleSingle(object):
header = fileobj.read(AS_HEADER_LENGTH)
try:
magic, version, ig, nentry = struct.unpack(AS_HEADER_FORMAT, header)
except ValueError, arg:
except ValueError as arg:
raise Error, "Unpack header error: %s" % (arg,)
if verbose:
print 'Magic: 0x%8.8x' % (magic,)
@ -65,7 +65,7 @@ class AppleSingle(object):
for hdr in headers:
try:
restype, offset, length = struct.unpack(AS_ENTRY_FORMAT, hdr)
except ValueError, arg:
except ValueError as arg:
raise Error, "Unpack entry error: %s" % (arg,)
if verbose:
print "Fork %d, offset %d, length %d" % (restype, offset, length)

4
Lib/plat-mac/argvemulator.py
View file

@ -52,7 +52,7 @@ class ArgvCollector:
if what == kHighLevelEvent:
try:
AE.AEProcessAppleEvent(event)
except AE.Error, err:
except AE.Error as err:
msg = "High Level Event: %r %r" % (hex(message), hex(h | (v<<16)))
print 'AE error: ', err
print 'in', msg
@ -77,7 +77,7 @@ class ArgvCollector:
fsref = alias.FSResolveAlias(None)[0]
pathname = fsref.as_pathname()
sys.argv.append(pathname)
except Exception, e:
except Exception as e:
print "argvemulator.py warning: can't unpack an open document event"
import traceback
traceback.print_exc()

2
Lib/plat-mac/buildtools.py
View file

@ -78,7 +78,7 @@ def process(template, filename, destname, copy_codefragment=0,
fp.close()
try:
code = compile(text + '\n', filename, "exec")
except SyntaxError, arg:
except SyntaxError as arg:
raise BuildError, "Syntax error in script %s: %s" % (filename, arg)
except EOFError:
raise BuildError, "End-of-file in script %s" % (filename,)

2
Lib/plat-mac/bundlebuilder.py
View file

@ -764,7 +764,7 @@ def makedirs(dir):
directory. Don't moan if any path element already exists."""
try:
os.makedirs(dir)
except OSError, why:
except OSError as why:
if why.errno != errno.EEXIST:
raise

6
Lib/plat-mac/gensuitemodule.py
View file

@ -114,7 +114,7 @@ def main_interactive(interact=0, basepkgname='StdSuites'):
try:
processfile(filename, edit_modnames=edit_modnames, basepkgname=basepkgname,
verbose=sys.stderr)
except MacOS.Error, arg:
except MacOS.Error as arg:
print "Error getting terminology:", arg
print "Retry, manually parsing resources"
processfile_fromresource(filename, edit_modnames=edit_modnames,
@ -190,7 +190,7 @@ def processfile(fullname, output=None, basepkgname=None,
print >>verbose, "\nASKING FOR aete DICTIONARY IN", repr(fullname)
try:
aedescobj, launched = OSATerminology.GetAppTerminology(fullname)
except MacOS.Error, arg:
except MacOS.Error as arg:
if arg[0] in (-1701, -192): # errAEDescNotFound, resNotFound
if verbose:
print >>verbose, "GetAppTerminology failed with errAEDescNotFound/resNotFound, trying manually"
@ -244,7 +244,7 @@ def getappterminology(fullname, verbose=None):
talker = aetools.TalkTo(cr)
try:
talker._start()
except (MacOS.Error, aetools.Error), arg:
except (MacOS.Error, aetools.Error) as arg:
if verbose:
print >>verbose, 'Warning: start() failed, continuing anyway:', arg
reply = talker.send("ascr", "gdte")

8
Lib/plat-mac/macresource.py
View file

@ -76,14 +76,14 @@ def open_pathname(pathname, verbose=0):
AppleSingle file"""
try:
refno = Res.FSpOpenResFile(pathname, 1)
except Res.Error, arg:
except Res.Error as arg:
if arg[0] in (-37, -39):
# No resource fork. We may be on OSX, and this may be either
# a data-fork based resource file or a AppleSingle file
# from the CVS repository.
try:
refno = Res.FSOpenResourceFile(pathname, u'', 1)
except Res.Error, arg:
except Res.Error as arg:
if arg[0] != -199:
# -199 is "bad resource map"
raise
@ -103,14 +103,14 @@ def resource_pathname(pathname, verbose=0):
try:
refno = Res.FSpOpenResFile(pathname, 1)
Res.CloseResFile(refno)
except Res.Error, arg:
except Res.Error as arg:
if arg[0] in (-37, -39):
# No resource fork. We may be on OSX, and this may be either
# a data-fork based resource file or a AppleSingle file
# from the CVS repository.
try:
refno = Res.FSOpenResourceFile(pathname, u'', 1)
except Res.Error, arg:
except Res.Error as arg:
if arg[0] != -199:
# -199 is "bad resource map"
raise

10
Lib/plat-mac/pimp.py
View file

@ -76,7 +76,7 @@ def getDefaultDatabase(experimental=False):
url = DEFAULT_PIMPDATABASE_FMT % (PIMP_VERSION, status, pyvers, osname, rel, machine)
try:
urllib2.urlopen(url)
except urllib2.HTTPError, arg:
except urllib2.HTTPError as arg:
pass
else:
break
@ -589,13 +589,13 @@ class PimpPackage:
installTest = self._dict['Install-test'].strip() + '\n'
try:
exec(installTest, namespace)
except ImportError, arg:
except ImportError as arg:
return "no", str(arg)
except _scriptExc_NotInstalled, arg:
except _scriptExc_NotInstalled as arg:
return "no", str(arg)
except _scriptExc_OldInstalled, arg:
except _scriptExc_OldInstalled as arg:
return "old", str(arg)
except _scriptExc_BadInstalled, arg:
except _scriptExc_BadInstalled as arg:
return "bad", str(arg)
except:
sys.stderr.write("-------------------------------------\n")

2
Lib/plat-mac/terminalcommand.py
View file

@ -35,7 +35,7 @@ def run(command):
try:
theEvent.AESend(SEND_MODE, kAENormalPriority, kAEDefaultTimeout)
except AE.Error, why:
except AE.Error as why:
if why[0] != -600: # Terminal.app not yet running
raise
os.system(START_TERMINAL)

4
Lib/platform.py
View file

@ -404,10 +404,10 @@ def _syscmd_ver(system='',release='',version='',
raise os.error,'command failed'
# XXX How can I supress shell errors from being written
# to stderr ?
except os.error,why:
except os.error as why:
#print 'Command %s failed: %s' % (cmd,why)
continue
except IOError,why:
except IOError as why:
#print 'Command %s failed: %s' % (cmd,why)
continue
else:

8
Lib/poplib.py
View file

@ -86,7 +86,7 @@ class POP3:
try:
self.sock = socket.socket(af, socktype, proto)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.sock:
self.sock.close()
self.sock = None
@ -262,7 +262,7 @@ class POP3:
"""Signoff: commit changes on server, unlock mailbox, close connection."""
try:
resp = self._shortcmd('QUIT')
except error_proto, val:
except error_proto as val:
resp = val
self.file.close()
self.sock.close()
@ -347,7 +347,7 @@ class POP3_SSL(POP3):
try:
self.sock = socket.socket(af, socktype, proto)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.sock:
self.sock.close()
self.sock = None
@ -399,7 +399,7 @@ class POP3_SSL(POP3):
"""Signoff: commit changes on server, unlock mailbox, close connection."""
try:
resp = self._shortcmd('QUIT')
except error_proto, val:
except error_proto as val:
resp = val
self.sock.close()
del self.sslobj, self.sock

2
Lib/pstats.py
View file

@ -618,7 +618,7 @@ if __name__ == '__main__':
if line:
try:
self.stats = Stats(line)
except IOError, args:
except IOError as args:
print >> self.stream, args[1]
return
self.prompt = line + "% "

2
Lib/pty.py
View file

@ -56,7 +56,7 @@ def _open_terminal():
else:
try:
tty_name, master_fd = sgi._getpty(os.O_RDWR, 0666, 0)
except IOError, msg:
except IOError as msg:
raise os.error, msg
return master_fd, tty_name
for x in 'pqrstuvwxyzPQRST':

4
Lib/py_compile.py
View file

@ -123,7 +123,7 @@ def compile(file, cfile=None, dfile=None, doraise=False):
codestring = codestring + '\n'
try:
codeobject = __builtin__.compile(codestring, dfile or file,'exec')
except Exception,err:
except Exception as err:
py_exc = PyCompileError(err.__class__,err.args,dfile or file)
if doraise:
raise py_exc
@ -157,7 +157,7 @@ def main(args=None):
for filename in args:
try:
compile(filename, doraise=True)
except PyCompileError,err:
except PyCompileError as err:
sys.stderr.write(err.msg)
if __name__ == "__main__":

8
Lib/pydoc.py
View file

@ -1479,7 +1479,7 @@ def doc(thing, title='Python Library Documentation: %s', forceload=0):
object = type(object)
desc += ' object'
pager(title % desc + '\n\n' + text.document(object, name))
except (ImportError, ErrorDuringImport), value:
except (ImportError, ErrorDuringImport) as value:
print value
def writedoc(thing, forceload=0):
@ -1491,7 +1491,7 @@ def writedoc(thing, forceload=0):
file.write(page)
file.close()
print 'wrote', name + '.html'
except (ImportError, ErrorDuringImport), value:
except (ImportError, ErrorDuringImport) as value:
print value
def writedocs(dir, pkgpath='', done=None):
@ -1920,7 +1920,7 @@ def serve(port, callback=None, completer=None):
if path and path != '.':
try:
obj = locate(path, forceload=1)
except ErrorDuringImport, value:
except ErrorDuringImport as value:
self.send_document(path, html.escape(str(value)))
return
if obj:
@ -2223,7 +2223,7 @@ def cli():
writedoc(arg)
else:
help.help(arg)
except ErrorDuringImport, value:
except ErrorDuringImport as value:
print value
except (getopt.error, BadUsage):

4
Lib/quopri.py
View file

@ -194,7 +194,7 @@ def main():
import getopt
try:
opts, args = getopt.getopt(sys.argv[1:], 'td')
except getopt.error, msg:
except getopt.error as msg:
sys.stdout = sys.stderr
print msg
print "usage: quopri [-t | -d] [file] ..."
@ -218,7 +218,7 @@ def main():
else:
try:
fp = open(file)
except IOError, msg:
except IOError as msg:
sys.stderr.write("%s: can't open (%s)\n" % (file, msg))
sts = 1
continue

4
Lib/re.py
View file

@ -229,7 +229,7 @@ def _compile(*key):
raise TypeError, "first argument must be string or compiled pattern"
try:
p = sre_compile.compile(pattern, flags)
except error, v:
except error as v:
raise error, v # invalid expression
if len(_cache) >= _MAXCACHE:
_cache.clear()
@ -244,7 +244,7 @@ def _compile_repl(*key):
repl, pattern = key
try:
p = sre_parse.parse_template(repl, pattern)
except error, v:
except error as v:
raise error, v # invalid expression
if len(_cache_repl) >= _MAXCACHE:
_cache_repl.clear()

6
Lib/rexec.py
View file

@ -551,7 +551,7 @@ def test():
if args and args[0] != '-':
try:
fp = open(args[0])
except IOError, msg:
except IOError as msg:
print "%s: can't open file %r" % (sys.argv[0], args[0])
return 1
if fp.isatty():
@ -566,7 +566,7 @@ def test():
r.s_apply(code.InteractiveConsole.runcode, (self, co))
try:
RestrictedConsole(r.modules['__main__'].__dict__).interact()
except SystemExit, n:
except SystemExit as n:
return n
else:
text = fp.read()
@ -574,7 +574,7 @@ def test():
c = compile(text, fp.name, 'exec')
try:
r.s_exec(c)
except SystemExit, n:
except SystemExit as n:
return n
except:
traceback.print_exc()

2
Lib/sgmllib.py
View file

@ -530,7 +530,7 @@ def test(args = None):
else:
try:
f = open(file, 'r')
except IOError, msg:
except IOError as msg:
print file, ":", msg
sys.exit(1)

10
Lib/shutil.py
View file

@ -121,18 +121,18 @@ def copytree(src, dst, symlinks=False):
else:
copy2(srcname, dstname)
# XXX What about devices, sockets etc.?
except (IOError, os.error), why:
except (IOError, os.error) as why:
errors.append((srcname, dstname, str(why)))
# catch the Error from the recursive copytree so that we can
# continue with other files
except Error, err:
except Error as err:
errors.extend(err.args[0])
try:
copystat(src, dst)
except WindowsError:
# can't copy file access times on Windows
pass
except OSError, why:
except OSError as why:
errors.extend((src, dst, str(why)))
if errors:
raise Error, errors
@ -157,7 +157,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
names = []
try:
names = os.listdir(path)
except os.error, err:
except os.error as err:
onerror(os.listdir, path, sys.exc_info())
for name in names:
fullname = os.path.join(path, name)
@ -170,7 +170,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
else:
try:
os.remove(fullname)
except os.error, err:
except os.error as err:
onerror(os.remove, fullname, sys.exc_info())
try:
os.rmdir(path)

2
Lib/site.py
View file

@ -391,7 +391,7 @@ def execsitecustomize():
import sitecustomize
except ImportError:
pass
except Exception, err:
except Exception as err:
if os.environ.get("PYTHONVERBOSE"):
raise
sys.stderr.write(

8
Lib/smtpd.py
View file

@ -357,10 +357,10 @@ class PureProxy(SMTPServer):
refused = s.sendmail(mailfrom, rcpttos, data)
finally:
s.quit()
except smtplib.SMTPRecipientsRefused, e:
except smtplib.SMTPRecipientsRefused as e:
print >> DEBUGSTREAM, 'got SMTPRecipientsRefused'
refused = e.recipients
except (socket.error, smtplib.SMTPException), e:
except (socket.error, smtplib.SMTPException) as e:
print >> DEBUGSTREAM, 'got', e.__class__
# All recipients were refused. If the exception had an associated
# error code, use it. Otherwise,fake it with a non-triggering
@ -464,7 +464,7 @@ def parseargs():
opts, args = getopt.getopt(
sys.argv[1:], 'nVhc:d',
['class=', 'nosetuid', 'version', 'help', 'debug'])
except getopt.error, e:
except getopt.error as e:
usage(1, e)
options = Options()
@ -528,7 +528,7 @@ if __name__ == '__main__':
nobody = pwd.getpwnam('nobody')[2]
try:
os.setuid(nobody)
except OSError, e:
except OSError as e:
if e.errno != errno.EPERM: raise
print >> sys.stderr, \
'Cannot setuid "nobody"; try running with -n option.'

2
Lib/smtplib.py
View file

@ -306,7 +306,7 @@ class SMTP:
af, socktype, proto, canonname, sa = res
try:
self._get_socket(af,socktype,proto,sa)
except socket.error, msg:
except socket.error as msg:
if self.debuglevel > 0: print>>stderr, 'connect fail:', msg
if self.sock:
self.sock.close()

2
Lib/sqlite3/test/dbapi.py
View file

@ -326,7 +326,7 @@ class CursorTests(unittest.TestCase):
self.fail("should have raised a TypeError")
except TypeError:
return
except Exception, e:
except Exception as e:
print "raised", e.__class__
self.fail("raised wrong exception.")

Some files were not shown because too many files have changed in this diff Show more