Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index a3ba7384c1f93d1711f6b599cef05237ee4c3753..235963e93f57172eaec7e6d6fede6d3e36ff0dba 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 1.2c1?
 
 *Release date: XX-AUG-2006*
 
+- Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)
+
 - ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
 
 - When used w/o subprocess, all exceptions were preceded by an error

diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index 878425dc1e2c2e795b13c752f1d528a60da306f1..f325ad1d254ecc2e011f3754b0eca2cafda1b480 100644 (file)
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -76,6 +76,9 @@ class ScriptBinding:
             self.editwin.gotoline(nag.get_lineno())
             self.errorbox("Tab/space error", indent_message)
             return False
+        except IndentationError:
+            # From tokenize(), let compile() in checksyntax find it again.
+            pass
         return True
 
     def checksyntax(self, filename):