mirror of
https://github.com/python/cpython.git
synced 2025-10-28 01:00:34 +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
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue