[3.14] Backport idlelib changes in PR 142294 (#152986)

PR-142294 (3.15) deleted 'button_ok in textview and 'was_executing' in pyshell.  Backport to 3.14 and 3.13.

diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 1cf33dd528eaafeb430998e790e3395739f18b4b..ef3d014d936ce851d934fc7b9f2dcda11749c53b 100755 (executable)
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -512,7 +512,6 @@ class ModifiedInterpreter(InteractiveInterpreter):
         self.rpcclt.close()
         self.terminate_subprocess()
         console = self.tkconsole
-        was_executing = console.executing
         console.executing = False
         self.spawn_subprocess()
         try:

diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py
index 23f0f4cb5027ec317c75f1cf1ffeb626c255ec0c..0f719a06883ad726e860a70f3d39829f1dbd1b7b 100644 (file)
--- a/Lib/idlelib/textview.py
+++ b/Lib/idlelib/textview.py
@@ -129,8 +129,8 @@ class ViewWindow(Toplevel):
         self.title(title)
         self.viewframe = ViewFrame(self, contents, wrap=wrap)
         self.protocol("WM_DELETE_WINDOW", self.ok)
-        self.button_ok = button_ok = Button(self, text='Close',
-                                            command=self.ok, takefocus=False)
+        self.button_ok = Button(self, text='Close',
+                                command=self.ok, takefocus=False)
         self.viewframe.pack(side='top', expand=True, fill='both')
 
         self.is_modal = modal