https://github.com/python/cpython/commit/894940b1099677c1ca0aa527dbb935e47d3... commit: 894940b1099677c1ca0aa527dbb935e47d3d591a branch: 2.7 author: Tal Einat <taleinat+github@gmail.com> committer: GitHub <noreply@github.com> date: 2018-08-02T10:21:49+03:00 summary: [2.7] bpo-34120: fix IDLE freezing after closing dialogs (GH-8603) Added missing .grab_release() calls to all places where we call .grab_set(). (cherry picked from commit 10ea9409ceb5da83cb380b610750551e26561044) files: A Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst M Lib/idlelib/aboutDialog.py M Lib/idlelib/configDialog.py M Lib/idlelib/configHelpSourceEdit.py M Lib/idlelib/configSectionNameDialog.py M Lib/idlelib/idle_test/test_config_name.py M Lib/idlelib/keybindingDialog.py M Lib/idlelib/textView.py diff --git a/Lib/idlelib/aboutDialog.py b/Lib/idlelib/aboutDialog.py index c9adc08bb2fc..87d6c3cb9c08 100644 --- a/Lib/idlelib/aboutDialog.py +++ b/Lib/idlelib/aboutDialog.py @@ -141,6 +141,7 @@ def display_file_text(self, title, filename, encoding=None): textView.view_file(self, title, fn, encoding) def Ok(self, event=None): + self.grab_release() self.destroy() if __name__ == '__main__': diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index d53f5ff2008d..3c29af13763c 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1197,10 +1197,12 @@ def ActivateConfigChanges(self): instance.reset_help_menu_entries() def Cancel(self): + self.grab_release() self.destroy() def Ok(self): self.Apply() + self.grab_release() self.destroy() def Apply(self): diff --git a/Lib/idlelib/configHelpSourceEdit.py b/Lib/idlelib/configHelpSourceEdit.py index 5816449caf5e..62b010a0ca20 100644 --- a/Lib/idlelib/configHelpSourceEdit.py +++ b/Lib/idlelib/configHelpSourceEdit.py @@ -155,10 +155,12 @@ def Ok(self, event=None): # Mac Safari insists on using the URI form for local files self.result = list(self.result) self.result[1] = "file://" + path + self.grab_release() self.destroy() def Cancel(self, event=None): self.result = None + self.grab_release() self.destroy() if __name__ == '__main__': diff --git a/Lib/idlelib/configSectionNameDialog.py b/Lib/idlelib/configSectionNameDialog.py index c09dca896b0c..f28dc1a28363 100644 --- a/Lib/idlelib/configSectionNameDialog.py +++ b/Lib/idlelib/configSectionNameDialog.py @@ -80,10 +80,13 @@ def Ok(self, event=None): name = self.name_ok() if name: self.result = name + self.grab_release() self.destroy() def Cancel(self, event=None): self.result = '' + self.grab_release() self.destroy() + if __name__ == '__main__': import unittest unittest.main('idlelib.idle_test.test_config_name', verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_config_name.py b/Lib/idlelib/idle_test/test_config_name.py index 4403f87fd3b1..2a4df6a74458 100644 --- a/Lib/idlelib/idle_test/test_config_name.py +++ b/Lib/idlelib/idle_test/test_config_name.py @@ -15,6 +15,8 @@ class Dummy_name_dialog(object): name = Var() result = None destroyed = False + def grab_release(self): + pass def destroy(self): self.destroyed = True diff --git a/Lib/idlelib/keybindingDialog.py b/Lib/idlelib/keybindingDialog.py index 4d32ca947698..755f1af47e21 100644 --- a/Lib/idlelib/keybindingDialog.py +++ b/Lib/idlelib/keybindingDialog.py @@ -217,10 +217,12 @@ def TranslateKey(self, key, modifiers): def OK(self, event=None): if self.advanced or self.KeysOK(): # doesn't check advanced string yet self.result=self.keyString.get() + self.grab_release() self.destroy() def Cancel(self, event=None): self.result='' + self.grab_release() self.destroy() def KeysOK(self): diff --git a/Lib/idlelib/textView.py b/Lib/idlelib/textView.py index b8c4ac1821d7..ec837f810c30 100644 --- a/Lib/idlelib/textView.py +++ b/Lib/idlelib/textView.py @@ -39,7 +39,8 @@ def __init__(self, parent, title, text, modal=True, _htest=False): self.textView.insert(0.0, text) self.textView.config(state=DISABLED) - if modal: + self.is_modal = modal + if self.is_modal: self.transient(parent) self.grab_set() self.wait_window() @@ -62,6 +63,8 @@ def CreateWidgets(self): frameText.pack(side=TOP,expand=TRUE,fill=BOTH) def Ok(self, event=None): + if self.is_modal: + self.grab_release() self.destroy() diff --git a/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst b/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst new file mode 100644 index 000000000000..f9954f7c1af0 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-08-01-23-25-38.bpo-34120.HgsIz-.rst @@ -0,0 +1 @@ +Fix unresponsiveness after closing certain windows and dialogs. \ No newline at end of file