1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 70778 via svnmerge from

Browse Source 
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.
........
This commit is contained in:
Ronald Oussoren 2009-03-30 23:16:10 +00:00
parent 70d61cedf7
commit fa1fcd107d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/site.py
View File

@ -268,13 +268,15 @@ def addsitepackages(known_paths):
if sys.platform == "darwin": if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple # for framework builds *only* we add the standard Apple
# locations. Currently only per-user, but /Library and # locations.
# /Network/Library could be added too
if 'Python.framework' in prefix: if 'Python.framework' in prefix:
sitedirs.append( sitedirs.append(
os.path.expanduser( os.path.expanduser(
os.path.join("~", "Library", "Python", os.path.join("~", "Library", "Python",
sys.version[:3], "site-packages"))) sys.version[:3], "site-packages")))
sitedirs.append(
os.path.join("/Library", "Python",
sys.version[:3], "site-packages"))
for sitedir in sitedirs: for sitedir in sitedirs:
if os.path.isdir(sitedir): if os.path.isdir(sitedir):

6
Misc/NEWS
View File

@ -1,5 +1,4 @@
+++++++++++ +++++++++++ Python News
Python News
+++++++++++ +++++++++++
(editors: check NEWS.help for information about editing NEWS using ReST.) (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 #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 - Issue #4688: Add a heuristic so that tuples and dicts containing only
untrackable objects are not tracked by the garbage collector. This can untrackable objects are not tracked by the garbage collector. This can
reduce the size of collections and therefore the garbage collection overhead reduce the size of collections and therefore the garbage collection overhead