[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 - Issue #15308: Add 'interrupt execution' (^C) to Shell menu.

Mon Sep 12 01:57:41 EDT 2016

https://hg.python.org/cpython/rev/63f6ac38d18d
changeset: 103693:63f6ac38d18d
parent: 103690:fdb5ae2f25c6
parent: 103692:74b84014bc27
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Sep 12 01:57:25 2016 -0400
summary:
 Merge 3.5 - Issue #15308: Add 'interrupt execution' (^C) to Shell menu.
Patch by Roger Serwy, updated by Bayard Randel.
files:
 Doc/library/idle.rst | 3 +
 Lib/idlelib/NEWS.txt | 3 +
 Lib/idlelib/README.txt | 9 ++-
 Lib/idlelib/help.html | 62 +++++++++++++++++++---------
 Lib/idlelib/mainmenu.py | 2 +
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +
 7 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -226,6 +226,9 @@
 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/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -2,6 +2,9 @@
 ===========================
 *Release date: 2016年12月16日?*
 
+- Issue #15308: Add 'interrupt execution' (^C) to Shell menu.
+ Patch by Roger Serwy, updated by Bayard Randel.
+
 - Issue #27922: Stop IDLE tests from 'flashing' gui widgets on the screen.
 
 - Issue #27891: Consistently group and sort imports within idlelib modules.
diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt
--- a/Lib/idlelib/README.txt
+++ b/Lib/idlelib/README.txt
@@ -160,13 +160,14 @@
 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, debugger_r
- Stack Viewer # stackviewer
+ debugger # debugger, debugger_r, PyShell.toggle_debuger
+ Stack Viewer # stackviewer, PyShell.open_stack_viewer
 Auto-open Stack Viewer # stackviewer
 
 Format (Editor only)
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -65,6 +65,21 @@
 
 <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li>
 <li class="nav-item nav-item-2"><a href="tk.html" accesskey="U">25. Graphical User Interfaces with Tk</a> »</li>
+ <li class="right">
+
+
+ <div class="inline-search" style="display: none" role="search">
+ <form class="inline-search" action="../search.html" method="get">
+ <input placeholder="Quick search" type="text" name="q" />
+ <input type="submit" value="Go" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+ </div>
+ <script type="text/javascript">$('.inline-search').show(0);</script>
+ |
+ </li>
+
 </ul>
 </div>
 
@@ -240,6 +255,8 @@
 <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">
@@ -649,26 +666,14 @@
 <h4>Next topic</h4>
 <p class="topless"><a href="othergui.html"
 title="next chapter">25.6. Other Graphical User Interface Packages</a></p>
-<h3>This Page</h3>
-<ul class="this-page-menu">
- <li><a href="../bugs.html">Report a Bug</a></li>
- <li><a href="../_sources/library/idle.txt"
- rel="nofollow">Show Source</a></li>
-</ul>
-
-<div id="searchbox" style="display: none" role="search">
- <h3>Quick search</h3>
- <form class="search" action="../search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
+ <div role="note" aria-label="source link">
+ <h3>This Page</h3>
+ <ul class="this-page-menu">
+ <li><a href="../bugs.html">Report a Bug</a></li>
+ <li><a href="../_sources/library/idle.txt"
+ rel="nofollow">Show Source</a></li>
+ </ul>
+ </div>
 </div>
 </div>
 <div class="clearer"></div>
@@ -697,6 +702,21 @@
 
 <li class="nav-item nav-item-1"><a href="index.html" >The Python Standard Library</a> »</li>
 <li class="nav-item nav-item-2"><a href="tk.html" >25. Graphical User Interfaces with Tk</a> »</li>
+ <li class="right">
+
+
+ <div class="inline-search" style="display: none" role="search">
+ <form class="inline-search" action="../search.html" method="get">
+ <input placeholder="Quick search" type="text" name="q" />
+ <input type="submit" value="Go" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+ </div>
+ <script type="text/javascript">$('.inline-search').show(0);</script>
+ |
+ </li>
+
 </ul>
 </div>
 <div class="footer">
@@ -705,7 +725,7 @@
 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.
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -69,6 +69,8 @@
 ('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/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1209,6 +1209,7 @@
 Abhilash Raj
 Shorya Raj
 Jeff Ramnani
+Bayard Randel
 Varpu Rantala
 Brodie Rao
 Rémi Rampin
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -379,6 +379,9 @@
 IDLE
 ----
 
+- Issue #15308: Add 'interrupt execution' (^C) to Shell menu.
+ Patch by Roger Serwy, updated by Bayard Randel.
+
 - Issue #27922: Stop IDLE tests from 'flashing' gui widgets on the screen.
 
 - Issue #27891: Consistently group and sort imports within idlelib modules.
-- 
Repository URL: https://hg.python.org/cpython
