Mercurial > cpython-lru_cache-weakref

diff Lib/site.py @ 68859:a364719e400a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Éric Araujo <merwok@netwok.org>
date Wed, 23 Mar 2011 02:06:24 +0100
parents 3c9232a684ae
children be5b8d1ded34
line wrap: on
line diff
--- a/Lib/site.py	Tue Mar 22 17:34:28 2011 -0700
+++ b/Lib/site.py	Wed Mar 23 02:06:24 2011 +0100
@@ -508,6 +508,11 @@
 
 
 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 @@
     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 = """\