mirror of
https://github.com/python/cpython.git
synced 2025-11-09 01:51:26 +00:00
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:
parent
6c2633e919
commit
e0154ed7ff
2 changed files with 8 additions and 4 deletions
|
|
@ -275,13 +275,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):
|
||||||
|
|
|
||||||
|
|
@ -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.)
|
||||||
|
|
@ -12,6 +11,9 @@ What's New in Python 2.7 alpha 1
|
||||||
Core and Builtins
|
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
|
- 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
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue