diff options
| 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) |
| commit | c09fca67e7babfda22964143c74dcd313470850a (patch) | |
| tree | 050cead4915139132014dfda4a07c2d0872d314a /Lib/site.py | |
| parent | f59c7b2bddbeb552dac8a1fc8c800c7789c81331 (diff) | |
| download | cpython-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 'Lib/site.py')
| -rw-r--r-- | Lib/site.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/site.py b/Lib/site.py index a2c0bec..fcfdbed 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -508,6 +508,11 @@ def execusercustomize(): def main(): + """Add standard site-specific directories to the module search path. + + This function is called automatically when this module is imported, + unless the python interpreter was started with the -S flag. + """ global ENABLE_USER_SITE abs_paths() @@ -526,7 +531,10 @@ def main(): if ENABLE_USER_SITE: execusercustomize() -main() +# Prevent edition of sys.path when python was started with -S and +# site is imported later. +if not sys.flags.no_site: + main() def _script(): help = """\ |