From bd361c662dd472115a698c9f1ce11e7631b7ebf5 Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Thu, 28 Feb 2019 18:53:55 -0500 Subject: [PATCH 1/2] bpo-36152: IDLE: Remove unused parameter from colorizer --- Lib/idlelib/colorizer.py | 19 ++----------------- Lib/idlelib/editor.py | 2 +- .../2019-02-28-18-52-40.bpo-36152.9pkHIU.rst | 1 + 3 files changed, 4 insertions(+), 18 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index fd13281fb29500d..facbef8bb189191 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -66,8 +66,6 @@ class ColorDelegator(Delegator): colorizing: Boolean flag when colorizing is in process. stop_colorizing: Boolean flag to end an active colorizing process. - close_when_done: Widget to destroy after colorizing process - completes (doesn't seem to be used by IDLE). """ def __init__(self): @@ -157,9 +155,7 @@ def notify_range(self, index1, index2=None): self.after_id = self.after(1, self.recolorize) return - close_when_done = None # Window to be closed when done colorizing. - - def close(self, close_when_done=None): + def close(self): if self.after_id: after_id = self.after_id self.after_id = None @@ -167,11 +163,6 @@ def close(self, close_when_done=None): self.after_cancel(after_id) self.allow_colorizing = False self.stop_colorizing = True - if close_when_done: - if not self.colorizing: - close_when_done.destroy() - else: - self.close_when_done = close_when_done def toggle_colorize_event(self, event=None): """Toggle colorizing on and off. @@ -205,9 +196,7 @@ def recolorize(self): process is not already running. After colorizing is complete, some cleanup is done to - make sure that all the text has been colorized and to close - the window if the close event had been called while the - process was running. + make sure that all the text has been colorized. """ self.after_id = None if not self.delegate: @@ -232,10 +221,6 @@ def recolorize(self): if self.allow_colorizing and self.tag_nextrange("TODO", "1.0"): if DEBUG: print("reschedule colorizing") self.after_id = self.after(1, self.recolorize) - if self.close_when_done: - top = self.close_when_done - self.close_when_done = None - top.destroy() def recolorize_main(self): "Evaluate text and apply colorizing tags." diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index e05b52a96dcc615..83260329640e1ad 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -1033,7 +1033,7 @@ def _close(self): self.io = None self.undo = None if self.color: - self.color.close(False) + self.color.close() self.color = None self.text = None self.tkinter_vars = None diff --git a/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst b/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst new file mode 100644 index 000000000000000..13e1f2fe35001f1 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst @@ -0,0 +1 @@ +Remove unused close_when_done parameter from colorizer close() method. From fab9312a12269a30af20b141e7524399ac28de39 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Thu, 28 Feb 2019 20:30:40 -0500 Subject: [PATCH 2/2] Blurb: add detail on API change. Omit that both class and instance attribute. --- .../NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst b/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst index 13e1f2fe35001f1..b75ae89ef30a859 100644 --- a/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst +++ b/Misc/NEWS.d/next/IDLE/2019-02-28-18-52-40.bpo-36152.9pkHIU.rst @@ -1 +1,3 @@ -Remove unused close_when_done parameter from colorizer close() method. +Remove colorizer.ColorDelegator.close_when_done and the +corresponding argument of .close(). In IDLE, both have +always been None or False since 2007.