Null merge.

2012-12-27 22:00:12 +02:00 · 2012-12-27 22:00:12 +02:00 · a0b7e9c74c
parent 0e091b0365 61006a2113
commit a0b7e9c74c
2 changed files with 4 additions and 1 deletions
--- 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -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.