From bc7d96ee332c8a575a453ec81367f2ad499f57d3 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 26 Jan 2022 19:41:13 -0800 Subject: [PATCH] bpo-45296: Clarify close, quit, and exit in IDLE (GH-30936) In the File menu, 'Close' and 'Exit' are now 'Close Window' (the current one) and 'Exit' is now 'Exit IDLE' (by closing all windows). In Shell, 'quit()' and 'exit()' mean 'close Shell'. If there are no other windows, this also exits IDLE. (cherry picked from commit fcde0bc10ddd836b62d0a8e893d80b8c55e0ba3f) Co-authored-by: Terry Jan Reedy --- Doc/library/idle.rst | 10 ++++++---- Lib/idlelib/help.html | 20 ++++++++++--------- Lib/idlelib/mainmenu.py | 4 ++-- .../2022-01-26-19-33-55.bpo-45296.LzZKdU.rst | 4 ++++ 4 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 Misc/NEWS.d/next/IDLE/2022-01-26-19-33-55.bpo-45296.LzZKdU.rst diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 4fa4f1e5d30..b8febb9a5b6 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -96,11 +96,13 @@ Save Copy As... Print Window Print the current window to the default printer. -Close - Close the current window (ask to save if unsaved). +Close Window + Close the current window (if an unsaved editor, ask to save; if an unsaved + Shell, ask to quit execution). Calling ``exit()`` or ``close()`` in the Shell + window also closes Shell. If this is the only window, also exit IDLE. -Exit - Close all windows and quit IDLE (ask to save unsaved windows). +Exit IDLE + Close all windows and quit IDLE (ask to save unsaved edit windows). Edit menu (Shell and Editor) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html index edc539cd628..d48622dbd17 100644 --- a/Lib/idlelib/help.html +++ b/Lib/idlelib/help.html @@ -5,7 +5,7 @@ - IDLE — Python 3.11.0a0 documentation + IDLE — Python 3.11.0a4 documentation @@ -18,7 +18,7 @@ @@ -71,7 +71,7 @@

Navigation

  • - 3.11.0a0 Documentation » + 3.11.0a4 Documentation »
  • The Python Standard Library »
    • @@ -163,9 +163,11 @@

    File menu (Shell and Editor)exit() or close() in the Shell +window also closes Shell. If this is the only window, also exit IDLE.

    -
    Exit

    Close all windows and quit IDLE (ask to save unsaved windows).

    +
    Exit IDLE

    Close all windows and quit IDLE (ask to save unsaved edit windows).

    @@ -971,7 +973,7 @@

    Navigation

  • - 3.11.0a0 Documentation » + 3.11.0a4 Documentation »
  • The Python Standard Library »
    • @@ -995,7 +997,7 @@

    Navigation

    - © Copyright 2001-2021, Python Software Foundation. + © Copyright 2001-2022, Python Software Foundation.
    The Python Software Foundation is a non-profit corporation. @@ -1003,8 +1005,8 @@

    Navigation



    - Last updated on Sep 06, 2021. - Found a bug? + Last updated on Jan 26, 2022. + Found a bug?
    Created using Sphinx 3.2.1. diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py index 74edce23483..a1b169176cb 100644 --- a/Lib/idlelib/mainmenu.py +++ b/Lib/idlelib/mainmenu.py @@ -34,8 +34,8 @@ None, ('Prin_t Window', '<>'), None, - ('_Close', '<>'), - ('E_xit', '<>'), + ('_Close Window', '<>'), + ('E_xit IDLE', '<>'), ]), ('edit', [ diff --git a/Misc/NEWS.d/next/IDLE/2022-01-26-19-33-55.bpo-45296.LzZKdU.rst b/Misc/NEWS.d/next/IDLE/2022-01-26-19-33-55.bpo-45296.LzZKdU.rst new file mode 100644 index 00000000000..a5b0f8b4ffa --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2022-01-26-19-33-55.bpo-45296.LzZKdU.rst @@ -0,0 +1,4 @@ +Clarify close, quit, and exit in IDLE. In the File menu, 'Close' and 'Exit' +are now 'Close Window' (the current one) and 'Exit' is now 'Exit IDLE' +(by closing all windows). In Shell, 'quit()' and 'exit()' mean 'close Shell'. +If there are no other windows, this also exits IDLE.