summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-03-30 23:10:35 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-03-30 23:10:35 (GMT)
commite0154ed7ff9cf476d93cc20b49b69ca5d39cf41b (patch)
tree03e428336b3a64775d496c39ce8e039f4f789a81
parent6c2633e919b2353341fd06407bfb4c0a993dcaeb (diff)
downloadcpython-e0154ed7ff9cf476d93cc20b49b69ca5d39cf41b.zip
cpython-e0154ed7ff9cf476d93cc20b49b69ca5d39cf41b.tar.gz
cpython-e0154ed7ff9cf476d93cc20b49b69ca5d39cf41b.tar.bz2
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.
-rw-r--r--Lib/site.py6
-rw-r--r--Misc/NEWS6
2 files changed, 8 insertions, 4 deletions
diff --git a/Lib/site.py b/Lib/site.py
index 21c7db2..abe6687 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -275,13 +275,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):
diff --git a/Misc/NEWS b/Misc/NEWS
index 1de2458..b0ae319 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,5 +1,4 @@
-+++++++++++
-Python News
++++++++++++ Python News
+++++++++++
(editors: check NEWS.help for information about editing NEWS using ReST.)
@@ -12,6 +11,9 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
+- Issue #4865: On MacOSX /Library/Python/2.7/site-packages is added to
+ the end sys.path, for compatibility with the system install of Python.
+
- Issue #4688: Add a heuristic so that tuples and dicts containing only
untrackable objects are not tracked by the garbage collector. This can
reduce the size of collections and therefore the garbage collection overhead