summaryrefslogtreecommitdiffstats
path: root/Lib/site.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-09-03 21:41:30 (GMT)
committerGuido van Rossum <guido@python.org>1997-09-03 21:41:30 (GMT)
commitad87d3e826439e319b35bb0f4fa1b5a0bac55ed1 (patch)
treed53844694ea4b74e60aab5e09823872a6efcb4ff /Lib/site.py
parent9efe8ef7a143d92cdf724c76f6bcf3f5c1ed7a66 (diff)
downloadcpython-ad87d3e826439e319b35bb0f4fa1b5a0bac55ed1.zip
cpython-ad87d3e826439e319b35bb0f4fa1b5a0bac55ed1.tar.gz
cpython-ad87d3e826439e319b35bb0f4fa1b5a0bac55ed1.tar.bz2
Give in to Mike Meyer -- add *both* lib/python1.5/packages and
lib/site-python to the path (if they exist). This is a reasonable compromise.
Diffstat (limited to 'Lib/site.py')
-rw-r--r--Lib/site.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/Lib/site.py b/Lib/site.py
index 7c387f1..60a2208 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -96,14 +96,16 @@ if sys.exec_prefix != sys.prefix:
for prefix in prefixes:
if prefix:
if sys.platform[:3] in ('win', 'mac'):
- sitedir = prefix
+ sitedirs = [prefix]
else:
- sitedir = os.path.join(prefix,
- "lib",
- "python" + sys.version[:3],
- "packages")
- if os.path.isdir(sitedir):
- addsitedir(sitedir)
+ sitedirs = [os.path.join(prefix,
+ "lib",
+ "python" + sys.version[:3],
+ "packages"),
+ os.path.join(prefix, "lib", "site-python")]
+ for sitedir in sitedirs:
+ if os.path.isdir(sitedir):
+ addsitedir(sitedir)
try:
import sitecustomize # Run arbitrary site specific code