summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_site.py3
-rw-r--r--Misc/NEWS8
2 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index e59fce2540..192f58a664 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -182,7 +182,8 @@ class HelperFunctionsTests(unittest.TestCase):
self.assertEquals(dirs[1], wanted)
# let's try the specific Apple location
- if sys.platform == "darwin":
+ if (sys.platform == "darwin" and
+ sysconfig.get_config_var("PYTHONFRAMEWORK")):
site.PREFIXES = ['Python.framework']
dirs = site.getsitepackages()
self.assertEqual(len(dirs), 4)
diff --git a/Misc/NEWS b/Misc/NEWS
index 803e0603db..b625e7b6bf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,14 @@ Extension Modules
- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
overflow checks in the audioop module.
+Tests
+-----
+
+- On darwin, test_site assumed that a framework build was being used, leading
+ to a failure where four directories were expected for site-packages instead
+ of two in a non-framework build.
+
+
What's New in Python 2.7 beta 2?
================================