summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst43
1 files changed, 42 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index ca6126a..1021e53 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -21,7 +21,7 @@ Command line
When invoking Python, you may specify any of these options::
- python [-bdEiOStuUvxX?] [-c command | -m module-name | script | - ] [args]
+ python [-bdEiOsStuUvxX?] [-c command | -m module-name | script | - ] [args]
The most common use case is, of course, a simple invocation of a script::
@@ -214,6 +214,29 @@ Miscellaneous options
+<<<<<<< .working
+=======
+ .. seealso::
+ :file:`Tools/scripts/fixdiv.py`
+ for a use of ``warnall``
+
+ :pep:`238` -- Changing the division operator
+
+
+.. cmdoption:: -s
+
+ Don't add user site directory to sys.path
+
+ .. versionadded:: 2.6
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
+.. cmdoption:: -S
+
+>>>>>>> .merge-right.r62788
Disable the import of the module :mod:`site` and the site-dependent
manipulations of :data:`sys.path` that it entails.
@@ -424,6 +447,24 @@ These environment variables influence Python's behavior.
.. versionadded:: 2.6
+.. envvar:: PYTHONNOUSERSITE
+
+ If this is set, Python won't add the user site directory to sys.path
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
+.. envvar:: PYTHONUSERBASE
+
+ Sets the base directory for the user site directory
+
+ .. seealso::
+
+ :pep:`370` -- Per user site-packages directory
+
+
.. envvar:: PYTHONEXECUTABLE
If this environment variable is set, ``sys.argv[0]`` will be set to its