diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2012-12-27 20:00:12 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2012-12-27 20:00:12 (GMT) |
| commit | a0b7e9c74c36cadf2546612788795986dca64484 (patch) | |
| tree | 839d48aab1609061631c86189e9362eb791661b6 | |
| parent | 0e091b036503adc1c46022dbf974bb2f64ceed17 (diff) | |
| parent | 61006a211339f592dcb60f20ee7e478ad012556d (diff) | |
| download | cpython-a0b7e9c74c36cadf2546612788795986dca64484.zip cpython-a0b7e9c74c36cadf2546612788795986dca64484.tar.gz cpython-a0b7e9c74c36cadf2546612788795986dca64484.tar.bz2 | |
Null merge.
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index efd3c54..0a01c9e 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -1611,7 +1611,7 @@ class IndentSearcher(object): try: try: _tokenize.tokenize(self.readline, self.tokeneater) - except _tokenize.TokenError: + except (_tokenize.TokenError, SyntaxError): # since we cut off the tokenizer early, we can trigger # spurious errors pass @@ -168,6 +168,9 @@ Core and Builtins 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 localhost tests. |