From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 30 Mar 2009 23:10:35 +0000 (+0000)
Subject: Fix issue #4865: add /Library/Python/2.7/site-packages to
X-Git-Tag: v2.7a1~1721
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0154ed7ff9cf476d93cc20b49b69ca5d39cf41b;p=python

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.
---

diff --git a/Lib/site.py b/Lib/site.py
index 21c7db24db..abe668759c 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 1de2458956..b0ae319c54 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