Null merge.
This commit is contained in:
commit
a0b7e9c74c
|
@ -1611,7 +1611,7 @@ class IndentSearcher(object):
|
||||||
try:
|
try:
|
||||||
try:
|
try:
|
||||||
_tokenize.tokenize(self.readline, self.tokeneater)
|
_tokenize.tokenize(self.readline, self.tokeneater)
|
||||||
except _tokenize.TokenError:
|
except (_tokenize.TokenError, SyntaxError):
|
||||||
# since we cut off the tokenizer early, we can trigger
|
# since we cut off the tokenizer early, we can trigger
|
||||||
# spurious errors
|
# spurious errors
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -168,6 +168,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by
|
||||||
|
Roger Serwy.
|
||||||
|
|
||||||
- Issue #16702: test_urllib2_localnet tests now correctly ignores proxies for
|
- Issue #16702: test_urllib2_localnet tests now correctly ignores proxies for
|
||||||
localhost tests.
|
localhost tests.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue