Skip to content

bpo-42508: Keep IDLE running on macOS #23577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2020
Merged

bpo-42508: Keep IDLE running on macOS #23577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
609d9ae
bpo-42508: Keep IDLE running on macOS
terryjreedy Dec 1, 2020
9a3dfe0
Ignore buggy 2nd run_module_event call.
terryjreedy Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/idlelib/NEWS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Released on 2021-10-04?
======================================


bpo-42508: Keep IDLE running on macOS. Remove obsolete workaround
that prevented running files with shortcuts when using new universal2
installers built on macOS 11.

bpo-42426: Fix reporting offset of the RE error in searchengine.

bpo-42416: Get docstrings for IDLE calltips more often
Expand Down
26 changes: 7 additions & 19 deletions Lib/idlelib/runscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""
import os
import tabnanny
import time
import tokenize

import tkinter.messagebox as tkMessageBox
Expand Down Expand Up @@ -42,9 +43,7 @@ def __init__(self, editwin):
self.root = self.editwin.root
# cli_args is list of strings that extends sys.argv
self.cli_args = []

if macosx.isCocoaTk():
self.editwin.text_frame.bind('<<run-module-event-2>>', self._run_module_event)
self.perf = 0.0 # Workaround for macOS 11 Uni2; see bpo-42508.

def check_module_event(self, event):
if isinstance(self.editwin, outwin.OutputWindow):
Expand Down Expand Up @@ -107,24 +106,10 @@ def checksyntax(self, filename):
finally:
shell.set_warning_stream(saved_stream)

def run_module_event(self, event):
if macosx.isCocoaTk():
# 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).
self.editwin.text_frame.after(200,
lambda: self.editwin.text_frame.event_generate(
'<<run-module-event-2>>'))
return 'break'
else:
return self._run_module_event(event)

def run_custom_event(self, event):
return self._run_module_event(event, customize=True)
return self.run_module_event(event, customize=True)

def _run_module_event(self, event, *, customize=False):
def run_module_event(self, event, *, customize=False):
"""Run the module after setting up the environment.

First check the syntax. Next get customization. If OK, make
Expand All @@ -133,6 +118,8 @@ def _run_module_event(self, event, *, customize=False):
module being executed and also add that directory to its
sys.path if not already included.
"""
if macosx.isCocoaTk() and (time.perf_counter() - self.perf < .05):
return 'break'
if isinstance(self.editwin, outwin.OutputWindow):
self.editwin.text.bell()
return 'break'
Expand Down Expand Up @@ -218,6 +205,7 @@ def errorbox(self, title, message):
# XXX This should really be a function of EditorWindow...
tkMessageBox.showerror(title, message, parent=self.editwin.text)
self.editwin.text.focus_set()
self.perf = time.perf_counter()


if __name__ == "__main__":
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/IDLE/2020-11-30-19-46-05.bpo-42508.fE7w4M.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Keep IDLE running on macOS. Remove obsolete workaround that prevented
running files with shortcuts when using new universal2 installers built
on macOS 11.