Skip to content

bpo-38792: Remove IDLE shell calltip before new prompt. #17150

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 6 commits into from
Jan 31, 2020
Merged

bpo-38792: Remove IDLE shell calltip before new prompt. #17150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d18880
bpo-38792: IDLE calltips may not properly close on KeyboardInterrupt
ZackerySpytz Nov 14, 2019
79f4541
Merge remote-tracking branch 'origin/master' into pr_17150
terryjreedy Jan 30, 2020
c2f61c3
Code changes.
terryjreedy Jan 30, 2020
8fed41a
News items.
terryjreedy Jan 30, 2020
8e3868b
move hiding the calltip into PyShell.resetoutput()
taleinat Jan 30, 2020
6d81dbe
slightly reword NEWS entry
taleinat Jan 30, 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
3 changes: 3 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,9 @@ Released on 2020-10-05?
======================================


bpo-38792: Close a shell calltip if a :exc:`KeyboardInterrupt`
or shell restart occurs. Patch by Zackery Spytz.

bpo-30780: Add remaining configdialog tests for buttons and
highlights and keys tabs.

Expand Down
4 changes: 2 additions & 2 deletions Lib/idlelib/calltip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _make_tk_calltip_window(self):
# See __init__ for usage
return calltip_w.CalltipWindow(self.text)

def _remove_calltip_window(self, event=None):
def remove_calltip_window(self, event=None):
if self.active_calltip:
self.active_calltip.hidetip()
self.active_calltip = None
Expand All @@ -55,7 +55,7 @@ def refresh_calltip_event(self, event):
self.open_calltip(False)

def open_calltip(self, evalfuncs):
self._remove_calltip_window()
self.remove_calltip_window()

hp = HyperParser(self.editwin, "insert")
sur_paren = hp.get_surrounding_brackets('(')
Expand Down
2 changes: 1 addition & 1 deletion Lib/idlelib/editor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
text.bind("<<run-module>>", scriptbinding.run_module_event)
text.bind("<<run-custom>>", scriptbinding.run_custom_event)
text.bind("<<do-rstrip>>", self.Rstrip(self).do_rstrip)
ctip = self.Calltip(self)
self.ctip = ctip = self.Calltip(self)
text.bind("<<try-open-calltip>>", ctip.try_open_calltip_event)
#refresh-calltip must come after paren-closed to work right
text.bind("<<refresh-calltip>>", ctip.refresh_calltip_event)
Expand Down
1 change: 1 addition & 0 deletions Lib/idlelib/pyshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,7 @@ def resetoutput(self):
self.text.insert("end-1c", "\n")
self.text.mark_set("iomark", "end-1c")
self.set_line_and_column()
self.ctip.remove_calltip_window()

def write(self, s, tags=()):
try:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/IDLE/2019-11-13-23-51-39.bpo-38792.xhTC5a.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Close an IDLE shell calltip if a :exc:`KeyboardInterrupt`
or shell restart occurs. Patch by Zackery Spytz.