traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Null merge.

This commit is contained in:
Serhiy Storchaka 2012-12-27 22:00:12 +02:00
parent 0e091b0365 61006a2113
commit a0b7e9c74c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/EditorWindow.py
View File

@ -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

3
Misc/NEWS
View File

@ -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.