diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 23:16:10 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 23:16:10 (GMT) |
| commit | fa1fcd107d0c90396b082a93f2de266bc769f003 (patch) | |
| tree | b4ff2142e9ccd7469ef3ccc3bfde40989ebab97d | |
| parent | 70d61cedf7b2efe358d11a6a14fe654f21f2598c (diff) | |
| download | cpython-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.
........
| -rw-r--r-- | Lib/site.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
2 files changed, 8 insertions, 4 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): @@ -1,5 +1,4 @@ -+++++++++++ -Python News ++++++++++++ Python News +++++++++++ (editors: check NEWS.help for information about editing NEWS using ReST.) @@ -18,6 +17,9 @@ Core and Builtins - 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 |