mirror of
https://github.com/python/cpython.git
synced 2025-07-29 14:15:07 +00:00
SF patch 1631942 by Collin Winter:
(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:
parent
893523e80a
commit
b940e113bf
295 changed files with 817 additions and 743 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue