diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 15:13:46 +0200 |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 15:13:46 +0200 |
commit | 61736bc38c208cb5ad133f2845696356210e9e54 (patch) | |
tree | 27456a7dab22b2e6a8512c5f40f02ffa159187a3 | |
parent | 5bf77fca1e8c862bddf43abed69a66350b2f9448 (diff) | |
download | cpython-61736bc38c208cb5ad133f2845696356210e9e54.tar.gz |
(backport) Fixes #11088: IDLE crashes when using F5 to run a script on OSX with Tk 8.5
Without this patch IDLE will crash reliably on OSX when Tkinter
is linked to TkCocoa 8.5.x.
To reproduce:
* Create a new file (script.py) with the following two lines:
x = raw_input('prompt: ')
print x
* Save the script
* Run the script using the F5 keyboard shortcut
(running from the menu works fine)
The patch is a fairly crude hack, but we haven't found a better
workaround for this Tk bug yet.
-rw-r--r-- | Lib/idlelib/ScriptBinding.py | 17 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py index 9a16e3c779..1139b30784 100644 --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -26,6 +26,7 @@ import tkMessageBox from idlelib import PyShell from idlelib.configHandler import idleConf +from idlelib import macosxSupport IDENTCHARS = string.ascii_letters + string.digits + "_" @@ -53,6 +54,9 @@ class ScriptBinding: self.flist = self.editwin.flist self.root = self.editwin.root + if macosxSupport.runningAsOSXApp(): + self.editwin.text_frame.bind('<<run-module-event-2>>', self._run_module_event) + def check_module_event(self, event): filename = self.getfilename() if not filename: @@ -166,6 +170,19 @@ class ScriptBinding: interp.runcode(code) return 'break' + if macosxSupport.runningAsOSXApp(): + # Tk-Cocoa in MacOSX is broken until at least + # Tk 8.5.9, and without this rather + # crude workaround IDLE would hang when a user + # tries to run a module using the keyboard shortcut + # (the menu item works fine). + _run_module_event = run_module_event + + def run_module_event(self, event): + self.editwin.text_frame.after(200, + lambda: self.editwin.text_frame.event_generate('<<run-module-event-2>>')) + return 'break' + def getfilename(self): """Get source filename. If not saved, offer to save (or create) file @@ -80,6 +80,9 @@ Core and Builtins Library ------- +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX + with Tk 8.5. + - Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD. |