mirror of
https://github.com/python/cpython.git
synced 2025-08-24 02:35:59 +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
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue