Issue #15308: Add 'interrupt execution' (^C) to Shell menu.

Patch by Roger Serwy, updated by Bayard Randel.

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fa1e97983501f81e6a0c66f5c10b80aeacc03e06..34f9a899ec0d414c05e6711be75d7f4e06f0fdc0 100644 (file)
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -222,6 +222,9 @@ View Last Restart
 Restart Shell
   Restart the shell to clean the environment.
 
+Interrupt Execution
+  Stop a running program.
+
 Debug menu (Shell window only)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
index 862e6ab561e3d90388d2bd837cbd42b9ed553cf2..2fd8532dc1e6213238144a311496844d3a0584a1 100644 (file)
--- a/Lib/idlelib/Bindings.py
+++ b/Lib/idlelib/Bindings.py
@@ -67,6 +67,8 @@ menudefs = [
  ('shell', [
    ('_View Last Restart', '<<view-restart>>'),
    ('_Restart Shell', '<<restart-shell>>'),
+   None,
+   ('_Interrupt Execution', '<<interrupt-execution>>'),
    ]),
  ('debug', [
    ('_Go to File/Line', '<<goto-file-line>>'),

diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt
index 7bf74c0fc4ad3edb8306e8d725cf335e987cbfde..bc169c88004a790f029ee9e5f534207f1ecf6da7 100644 (file)
--- a/Lib/idlelib/README.txt
+++ b/Lib/idlelib/README.txt
@@ -161,14 +161,15 @@ Edit
   Show surrounding parens  # ParenMatch (& Hyperparser)
 
 Shell  # PyShell
-  View Last Restart  # PyShell.?
-  Restart Shell  # PyShell.?
+  View Last Restart    # PyShell.PyShell.view_restart_mark
+  Restart Shell        # PyShell.PyShell.restart_shell
+  Interrupt Execution  # pyshell.PyShell.cancel_callback
 
 Debug (Shell only)
   Go to File/Line
-  Debugger  # Debugger, RemoteDebugger
-  Stack Viewer  # StackViewer
-  Auto-open Stack Viewer  # StackViewer
+  Debugger               # Debugger, RemoteDebugger, PyShell.toggle_debuger
+  Stack Viewer           # StackViewer, PyShell.open_stack_viewer
+  Auto-open Stack Viewer # StackViewer
 
 Format (Editor only)
   Indent Region

diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index efd16233eab38c1e80e0dc328d93d3342c370806..1c4598bfd5e07d736551aa2d35a54c613443dee2 100644 (file)
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -238,6 +238,8 @@ line.</dd>
 <dd>Scroll the shell window to the last Shell restart.</dd>
 <dt>Restart Shell</dt>
 <dd>Restart the shell to clean the environment.</dd>
+<dt>Interrupt Execution</dt>
+<dd>Stop a running program.</dd>
 </dl>
 </div>
 <div class="section" id="debug-menu-shell-window-only">
@@ -703,7 +705,7 @@ are currently:</p>
     The Python Software Foundation is a non-profit corporation.
     <a href="https://www.python.org/psf/donations/">Please donate.</a>
     <br />
-    Last updated on Aug 30, 2016.
+    Last updated on Sep 12, 2016.
     <a href="../bugs.html">Found a bug</a>?
     <br />
     Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.3.6.