[Python-checkins] r70778 - in python/trunk: Lib/site.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Mar 31 01:10:35 2009
New Revision: 70778

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


Modified:
   python/trunk/Lib/site.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/site.py
==============================================================================
--- python/trunk/Lib/site.py	(original)
+++ python/trunk/Lib/site.py	Tue Mar 31 01:10:35 2009
@@ -275,13 +275,15 @@
 
         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):

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Tue Mar 31 01:10:35 2009
@@ -1,5 +1,4 @@
-+++++++++++
-Python News
++++++++++++ Python News
 +++++++++++
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
@@ -12,6 +11,9 @@
 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