[Python-checkins] r60843 - python/trunk/Lib/idlelib/NEWS.txt python/trunk/Lib/idlelib/ScriptBinding.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Fri Feb 15 22:56:36 2008
New Revision: 60843

Modified:
   python/trunk/Lib/idlelib/NEWS.txt
   python/trunk/Lib/idlelib/ScriptBinding.py
Log:
ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.


Modified: python/trunk/Lib/idlelib/NEWS.txt
==============================================================================
--- python/trunk/Lib/idlelib/NEWS.txt	(original)
+++ python/trunk/Lib/idlelib/NEWS.txt	Fri Feb 15 22:56:36 2008
@@ -3,6 +3,8 @@
 
 *Release date: XX-XXX-2008*
 
+- ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat.
+
 - There was an error on exit if no sys.exitfunc was defined. Issue 1647.
 
 - Could not open files in .idlerc directory if latter was hidden on Windows.

Modified: python/trunk/Lib/idlelib/ScriptBinding.py
==============================================================================
--- python/trunk/Lib/idlelib/ScriptBinding.py	(original)
+++ python/trunk/Lib/idlelib/ScriptBinding.py	Fri Feb 15 22:56:36 2008
@@ -56,11 +56,11 @@
     def check_module_event(self, event):
         filename = self.getfilename()
         if not filename:
-            return
+            return 'break'
         if not self.checksyntax(filename):
-            return
+            return 'break'
         if not self.tabnanny(filename):
-            return
+            return 'break'
 
     def tabnanny(self, filename):
         f = open(filename, 'r')
@@ -136,12 +136,12 @@
         """
         filename = self.getfilename()
         if not filename:
-            return
+            return 'break'
         code = self.checksyntax(filename)
         if not code:
-            return
+            return 'break'
         if not self.tabnanny(filename):
-            return
+            return 'break'
         shell = self.shell
         interp = shell.interp
         if PyShell.use_subprocess:
@@ -164,6 +164,7 @@
         #         go to __stderr__.  With subprocess, they go to the shell.
         #         Need to change streams in PyShell.ModifiedInterpreter.
         interp.runcode(code)
+        return 'break'
 
     def getfilename(self):
         """Get source filename.  If not saved, offer to save (or create) file