summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/site.py6
-rw-r--r--Misc/NEWS6
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):
diff --git a/Misc/NEWS b/Misc/NEWS
index a12b8ea..de4245a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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