[Python-checkins] r70782 - in python/branches/py3k: Lib/site.py Misc/NEWS
ronald.oussoren
python-checkins at python.org
Tue Mar 31 01:16:10 CEST 2009
Author: ronald.oussoren
Date: Tue Mar 31 01:16:10 2009
New Revision: 70782
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/site.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/site.py
==============================================================================
--- python/branches/py3k/Lib/site.py (original)
+++ python/branches/py3k/Lib/site.py Tue Mar 31 01:16:10 2009
@@ -268,13 +268,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/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Tue Mar 31 01:16:10 2009
@@ -1,5 +1,4 @@
-+++++++++++
-Python News
++++++++++++ Python News
+++++++++++
(editors: check NEWS.help for information about editing NEWS using ReST.)
@@ -18,6 +17,9 @@
- Issue #5126: str.isprintable() returned False for space characters.
+- 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
More information about the Python-checkins
mailing list