summaryrefslogtreecommitdiffstats
path: root/Lib/site.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-03-30 23:16:10 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-03-30 23:16:10 (GMT)
commitfa1fcd107d0c90396b082a93f2de266bc769f003 (patch)
treeb4ff2142e9ccd7469ef3ccc3bfde40989ebab97d /Lib/site.py
parent70d61cedf7b2efe358d11a6a14fe654f21f2598c (diff)
downloadcpython-fa1fcd107d0c90396b082a93f2de266bc769f003.zip
cpython-fa1fcd107d0c90396b082a93f2de266bc769f003.tar.gz
cpython-fa1fcd107d0c90396b082a93f2de266bc769f003.tar.bz2
Merged revisions 70778 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70778 | ronald.oussoren | 2009-03-30 18:10:35 -0500 (Mon, 30 Mar 2009) | 4 lines Fix issue #4865: add /Library/Python/2.7/site-packages to sys.path on OSX, to make it easier to share (some) installed packages between the system install and a user install. ........
Diffstat (limited to 'Lib/site.py')
-rw-r--r--Lib/site.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/site.py b/Lib/site.py
index 0df1d04..7bbd962 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -268,13 +268,15 @@ def addsitepackages(known_paths):
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
- # locations. Currently only per-user, but /Library and
- # /Network/Library could be added too
+ # locations.
if 'Python.framework' in prefix:
sitedirs.append(
os.path.expanduser(
os.path.join("~", "Library", "Python",
sys.version[:3], "site-packages")))
+ sitedirs.append(
+ os.path.join("/Library", "Python",
+ sys.version[:3], "site-packages"))
for sitedir in sitedirs:
if os.path.isdir(sitedir):