bpo-37748: Re-order the Run menu. (GH-15115)

Put the most common choice, Run Module, at the top.

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index 5975e3bb5806288d4132bec56d3315807de55f20..0bd248c22b1820459baa5a6cdb6dd02451727598 100644 (file)
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -207,20 +207,6 @@ Strip trailing whitespace
 Run menu (Editor window only)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. _python-shell:
-
-Python Shell
-   Open or wake up the Python Shell window.
-
-.. _check-module:
-
-Check Module
-   Check the syntax of the module currently open in the Editor window. If the
-   module has not been saved IDLE will either prompt the user to save or
-   autosave, as selected in the General tab of the Idle Settings dialog.  If
-   there is a syntax error, the approximate location is indicated in the
-   Editor window.
-
 .. _run-module:
 
 Run Module
@@ -239,6 +225,20 @@ Run... Customized
    settings.  *Command Line Arguments* extend :data:`sys.argv` as if passed
    on a command line. The module can be run in the Shell without restarting.
 
+.. _check-module:
+
+Check Module
+   Check the syntax of the module currently open in the Editor window. If the
+   module has not been saved IDLE will either prompt the user to save or
+   autosave, as selected in the General tab of the Idle Settings dialog.  If
+   there is a syntax error, the approximate location is indicated in the
+   Editor window.
+
+.. _python-shell:
+
+Python Shell
+   Open or wake up the Python Shell window.
+
 
 Shell menu (Shell window only)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -295,8 +295,8 @@ Configure IDLE
    menu. For more details, see
    :ref:`Setting preferences <preferences>` under Help and preferences.
 
-   Most configuration options apply to all windows or all future windows.
-   The option items below only apply to the active window.
+Most configuration options apply to all windows or all future windows.
+The option items below only apply to the active window.
 
 Show/Hide Code Context (Editor Window only)
    Open a pane at the top of the edit window which shows the block context

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index e3e92bd75f09095196a7bff8b42b0076f284ecd9..0fff7003b9d6b0fb3dc8918f75ed2a0437988df0 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,9 @@ Released on 2019-10-20?
 ======================================
 
 
+bpo-37748: Reorder the Run menu.  Put the most common choice,
+Run Module, at the top.
+
 bpo-37692: Improve highlight config sample with example shell
 interaction and better labels for shell elements.
 

diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 49068df7a8b96c597c39826d0ee622f58b1a6fbf..91e66a4b9117b1367ba2f99223ced6c103d0258d 100644 (file)
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -210,16 +210,6 @@ including lines within multiline strings.</dd>
 </div>
 <div class="section" id="run-menu-editor-window-only">
 <span id="index-2"></span><h3>Run menu (Editor window only)<a class="headerlink" href="#run-menu-editor-window-only" title="Permalink to this headline">¶</a></h3>
-<dl class="docutils" id="python-shell">
-<dt>Python Shell</dt><dd>Open or wake up the Python Shell window.</dd>
-</dl>
-<dl class="docutils" id="check-module">
-<dt>Check Module</dt><dd>Check the syntax of the module currently open in the Editor window. If the
-module has not been saved IDLE will either prompt the user to save or
-autosave, as selected in the General tab of the Idle Settings dialog.  If
-there is a syntax error, the approximate location is indicated in the
-Editor window.</dd>
-</dl>
 <dl class="docutils" id="run-module">
 <dt>Run Module</dt><dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
 environment, then execute the module.  Output is displayed in the Shell
@@ -234,6 +224,16 @@ line.</dd>
 settings.  <em>Command Line Arguments</em> extend <a class="reference internal" href="sys.html#sys.argv" title="sys.argv"><code class="xref py py-data docutils literal notranslate"><span class="pre">sys.argv</span></code></a> as if passed
 on a command line. The module can be run in the Shell without restarting.</dd>
 </dl>
+<dl class="docutils" id="check-module">
+<dt>Check Module</dt><dd>Check the syntax of the module currently open in the Editor window. If the
+module has not been saved IDLE will either prompt the user to save or
+autosave, as selected in the General tab of the Idle Settings dialog.  If
+there is a syntax error, the approximate location is indicated in the
+Editor window.</dd>
+</dl>
+<dl class="docutils" id="python-shell">
+<dt>Python Shell</dt><dd>Open or wake up the Python Shell window.</dd>
+</dl>
 </div>
 <div class="section" id="shell-menu-shell-window-only">
 <h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-window-only" title="Permalink to this headline">¶</a></h3>
@@ -268,23 +268,26 @@ access to locals and globals.</dd>
 <dl class="docutils">
 <dt>Configure IDLE</dt><dd>Open a configuration dialog and change preferences for the following:
 fonts, indentation, keybindings, text color themes, startup windows and
-size, additional help sources, and extensions.  On macOS,  open the
+size, additional help sources, and extensions.  On macOS, open the
 configuration dialog by selecting Preferences in the application
-menu. For more, see
-<a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.
-Most configuration options apply to all windows or all future windows.
-The option items below only apply to the active window.</dd>
+menu. For more details, see
+<a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</dd>
+</dl>
+<p>Most configuration options apply to all windows or all future windows.
+The option items below only apply to the active window.</p>
+<dl class="docutils">
 <dt>Show/Hide Code Context (Editor Window only)</dt><dd>Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.  See
-<a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section below.</dd>
-<dt>Line Numbers (Editor Window only)</dt><dd>Open a column to the left of the edit window which shows the linenumber
-of each line of text.  The default is off unless configured on
-(see <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a>).</dd>
+<a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section
+below.</dd>
+<dt>Show/Hide Line Numbers (Editor Window only)</dt><dd>Open a column to the left of the edit window which shows the number
+of each line of text.  The default is off, which may be changed in the
+preferences (see <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a>).</dd>
 <dt>Zoom/Restore Height</dt><dd>Toggles the window between normal size and maximum height. The initial size
 defaults to 40 lines by 80 chars unless changed on the General tab of the
 Configure IDLE dialog.  The maximum height for a screen is determined by
 momentarily maximizing a window the first time one is zoomed on the screen.
-Changing screen settings may invalidate the saved height.  This toogle has
+Changing screen settings may invalidate the saved height.  This toggle has
 no effect when a window is maximized.</dd>
 </dl>
 </div>
@@ -900,7 +903,7 @@ also used for testing.</p>
 <br />
     <br />
 
-    Last updated on Jul 23, 2019.
+    Last updated on Aug 04, 2019.
     <a href="https://docs.python.org/3/bugs.html">Found a bug</a>?
     <br />
 

diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index fc51fb1b5d34803696465e471161313144dfff2a..74edce234838292859c4e5e17e5ac0f428b7dffd 100644 (file)
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -73,10 +73,10 @@ menudefs = [
    ]),
 
  ('run', [
-   ('Python Shell', '<<open-python-shell>>'),
-   ('C_heck Module', '<<check-module>>'),
    ('R_un Module', '<<run-module>>'),
    ('Run... _Customized', '<<run-custom>>'),
+   ('C_heck Module', '<<check-module>>'),
+   ('Python Shell', '<<open-python-shell>>'),
    ]),
 
  ('shell', [

diff --git a/Misc/NEWS.d/next/IDLE/2019-08-04-15-27-50.bpo-37748.0vf6pg.rst b/Misc/NEWS.d/next/IDLE/2019-08-04-15-27-50.bpo-37748.0vf6pg.rst
new file mode 100644 (file)
index 0000000..fc1d6b6
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-08-04-15-27-50.bpo-37748.0vf6pg.rst
@@ -0,0 +1 @@
+Reorder the Run menu.  Put the most common choice, Run Module, at the top.