mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

10
Lib/test/test_descr.py
View file

@ -945,7 +945,7 @@ def mro_disagreement():
def raises(exc, expected, callable, *args):
try:
callable(*args)
except exc, msg:
except exc as msg:
if not str(msg).startswith(expected):
raise TestFailed, "Message %r, expected %r" % (str(msg),
expected)
@ -1813,7 +1813,7 @@ def weakrefs():
no = NoWeak()
try:
weakref.ref(no)
except TypeError, msg:
except TypeError as msg:
verify(str(msg).find("weak reference") >= 0)
else:
verify(0, "weakref.ref(no) should be illegal")
@ -1866,7 +1866,7 @@ def properties():
for attr in "__doc__", "fget", "fset", "fdel":
try:
setattr(raw, attr, 42)
except TypeError, msg:
except TypeError as msg:
if str(msg).find('readonly') < 0:
raise TestFailed("when setting readonly attr %r on a "
"property, got unexpected TypeError "
@ -2416,7 +2416,7 @@ f = t(%r, 'w') # rexec can't catch this by itself
for code in code1, code2, code3:
try:
sandbox.r_exec(code)
except IOError, msg:
except IOError as msg:
if str(msg).find("restricted") >= 0:
outcome = "OK"
else:
@ -3523,7 +3523,7 @@ def test_mutable_bases():
try:
D.__bases__ = ()
except TypeError, msg:
except TypeError as msg:
if str(msg) == "a new-style class can't have only classic bases":
raise TestFailed, "wrong error message for .__bases__ = ()"
else: