diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index ffe842643ee..a629bc50dbc 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -226,6 +226,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/NEWS.txt b/Lib/idlelib/NEWS.txt index dfc83feb75f..c3c9f9c23de 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -2,6 +2,9 @@ What's New in IDLE 3.6.0? =========================== *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 index a879c1766e2..74ec08a0823 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -160,13 +160,14 @@ 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, 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 index 7860bfbc210..ffc03c4112f 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -65,6 +65,21 @@
  • The Python Standard Library »
  • 25. Graphical User Interfaces with Tk »
    • +
  • + + + + + | +
    • + @@ -240,6 +255,8 @@ line.
    Scroll the shell window to the last Shell restart.
    Restart Shell
    Restart the shell to clean the environment.
    +
    Interrupt Execution
    +
    Stop a running program.
    @@ -649,26 +666,14 @@ are currently:

    Next topic

    25.6. Other Graphical User Interface Packages

    -

    This Page

    - - - - +
    +

    This Page

    + +
    @@ -697,6 +702,21 @@ are currently:

  • The Python Standard Library »
  • 25. Graphical User Interfaces with Tk »
    • +
  • + + + + + | +
    • +
    @@ -705,7 +725,7 @@ are currently:

    The Python Software Foundation is a non-profit corporation. Please donate.
    - Last updated on Aug 30, 2016. + Last updated on Sep 12, 2016. Found a bug?
    Created using Sphinx 1.3.6. diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py index 965ada30812..65345cd1f16 100644 --- a/Lib/idlelib/mainmenu.py +++ b/Lib/idlelib/mainmenu.py @@ -69,6 +69,8 @@ menudefs = [ ('shell', [ ('_View Last Restart', '<>'), ('_Restart Shell', '<>'), + None, + ('_Interrupt Execution', '<>'), ]), ('debug', [ ('_Go to File/Line', '<>'), diff --git a/Misc/ACKS b/Misc/ACKS index 0aeb1b12433..7ceee351cbd 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1209,6 +1209,7 @@ Burton Radons Abhilash Raj Shorya Raj Jeff Ramnani +Bayard Randel Varpu Rantala Brodie Rao Rémi Rampin diff --git a/Misc/NEWS b/Misc/NEWS index 083b33f7dd5..e6f03849ab1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -379,6 +379,9 @@ Library 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.