summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-03-23 01:06:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-03-23 01:06:24 (GMT)
commitc09fca67e7babfda22964143c74dcd313470850a (patch)
tree050cead4915139132014dfda4a07c2d0872d314a /Doc/using
parentf59c7b2bddbeb552dac8a1fc8c800c7789c81331 (diff)
downloadcpython-c09fca67e7babfda22964143c74dcd313470850a.zip
cpython-c09fca67e7babfda22964143c74dcd313470850a.tar.gz
cpython-c09fca67e7babfda22964143c74dcd313470850a.tar.bz2
Do not touch sys.path when site is imported and python was started with -S.
Original patch by Carl Meyer, review by Brett Cannon, small doc editions by yours truly. Fixes #11591.
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index d1f47eb..b5a9b32 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -239,7 +239,9 @@ Miscellaneous options
.. cmdoption:: -S
Disable the import of the module :mod:`site` and the site-dependent
- manipulations of :data:`sys.path` that it entails.
+ manipulations of :data:`sys.path` that it entails. Also disable these
+ manipulations if :mod:`site` is explicitly imported later (call
+ :func:`site.main` if you want them to be triggered).
.. cmdoption:: -u