mirror of
https://github.com/python/cpython.git
synced 2025-07-09 20:35:26 +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
|
@ -348,7 +348,7 @@ class FaqDir:
|
|||
raise InvalidFile(file)
|
||||
try:
|
||||
fp = open(file)
|
||||
except IOError, msg:
|
||||
except IOError as msg:
|
||||
raise NoSuchFile(file, msg)
|
||||
try:
|
||||
return self.entryclass(fp, file, sec_num)
|
||||
|
@ -387,11 +387,11 @@ class FaqWizard:
|
|||
else:
|
||||
try:
|
||||
meth()
|
||||
except InvalidFile, exc:
|
||||
except InvalidFile as exc:
|
||||
self.error("Invalid entry file name %s" % exc.file)
|
||||
except NoSuchFile, exc:
|
||||
except NoSuchFile as exc:
|
||||
self.error("No entry with file name %s" % exc.file)
|
||||
except NoSuchSection, exc:
|
||||
except NoSuchSection as exc:
|
||||
self.error("No section number %s" % exc.section)
|
||||
self.epilogue()
|
||||
|
||||
|
@ -796,7 +796,7 @@ class FaqWizard:
|
|||
pass
|
||||
try:
|
||||
f = open(file, 'w')
|
||||
except IOError, why:
|
||||
except IOError as why:
|
||||
self.error(CANTWRITE, file=file, why=why)
|
||||
return
|
||||
date = time.ctime(now)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue