From 968e285a8cf8a2e90d752165c235898e31ef3cba Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy
Date: Wed, 23 Sep 2015 03:52:23 -0400
Subject: [PATCH] Issue #25219: Update doc for Idle command line options. Some
were missing and notes were not correct.
---
Doc/library/idle.rst | 31 ++++++++++++++++---------------
Lib/idlelib/help.html | 33 +++++++++++++++++----------------
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index ecc71156c9..24914e4697 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -504,27 +504,28 @@ Command line usage
::
- idle.py [-c command] [-d] [-e] [-s] [-t title] [arg] ...
-
- -c command run this command
- -d enable debugger
- -e edit mode; arguments are files to be edited
- -s run $IDLESTARTUP or $PYTHONSTARTUP first
+ idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ...
+
+ -c command run command in the shell window
+ -d enable debugger and open shell window
+ -e open editor window
+ -h print help message with legal combinatios and exit
+ -i open shell window
+ -r file run file in shell window
+ -s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window
-t title set title of shell window
+ - run stdin in shell (- must be last option before args)
If there are arguments:
-#. If ``-e`` is used, arguments are files opened for editing and
- ``sys.argv`` reflects the arguments passed to IDLE itself.
+* If ``-``, ``-c``, or ``r`` is used, all arguments are placed in
+ ``sys.argv[1:...]`` and ``sys.argv[0]`` is set to ``''``, ``'-c'``,
+ or ``'-r'``. No editor window is opened, even if that is the default
+ set in the Options dialog.
-#. Otherwise, if ``-c`` is used, all arguments are placed in
- ``sys.argv[1:...]``, with ``sys.argv[0]`` set to ``'-c'``.
+* Otherwise, arguments are files opened for editing and
+ ``sys.argv`` reflects the arguments passed to IDLE itself.
-#. Otherwise, if neither ``-e`` nor ``-c`` is used, the first
- argument is a script which is executed with the remaining arguments in
- ``sys.argv[1:...]`` and ``sys.argv[0]`` set to the script name. If the
- script name is '-', no script is executed but an interactive Python session
- is started; the arguments are still available in ``sys.argv``.
Running without a subprocess
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 7623203b7f..bb762755f6 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -478,27 +478,28 @@ executed in the Tk namespace, so this file is not useful for importing
functions to be used from IDLE’s Python shell.
25.5.4.1. Command line usage
-
idle.py [-c command] [-d] [-e] [-s] [-t title] [arg] ...
+idle.py [-c command] [-d] [-e] [-h] [-i] [-r file] [-s] [-t title] [-] [arg] ...
--c command run this command
--d enable debugger
--e edit mode; arguments are files to be edited
--s run $IDLESTARTUP or $PYTHONSTARTUP first
+-c command run command in the shell window
+-d enable debugger and open shell window
+-e open editor window
+-h print help message with legal combinatios and exit
+-i open shell window
+-r file run file in shell window
+-s run $IDLESTARTUP or $PYTHONSTARTUP first, in shell window
-t title set title of shell window
+- run stdin in shell (- must be last option before args)
If there are arguments:
-
-- If -e is used, arguments are files opened for editing and
+
+- If -, -c, or r is used, all arguments are placed in
+sys.argv[1:...] and sys.argv[0] is set to '', '-c',
+or '-r'. No editor window is opened, even if that is the default
+set in the Options dialog.
+- Otherwise, arguments are files opened for editing and
sys.argv reflects the arguments passed to IDLE itself.
-- Otherwise, if -c is used, all arguments are placed in
-sys.argv[1:...], with sys.argv[0] set to '-c'.
-- Otherwise, if neither -e nor -c is used, the first
-argument is a script which is executed with the remaining arguments in
-sys.argv[1:...] and sys.argv[0] set to the script name. If the
-script name is ‘-‘, no script is executed but an interactive Python session
-is started; the arguments are still available in sys.argv.
-
+
25.5.4.2. Running without a subprocess
@@ -661,7 +662,7 @@ are currently:
The Python Software Foundation is a non-profit corporation.
Please donate.
- Last updated on Sep 12, 2015.
+ Last updated on Sep 23, 2015.
Found a bug?
Created using
Sphinx 1.2.3.
--
2.40.0