Ensure that test_site actually passes with a framework build
diff --git a/Lib/site.py b/Lib/site.py
index 4624bf3..2944934 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -295,7 +295,7 @@
# locations.
from sysconfig import get_config_var
framework = get_config_var("PYTHONFRAMEWORK")
- if framework and "/%s.framework/"%(framework,) in prefix:
+ if framework:
sitepackages.append(
os.path.join("/Library", framework,
sys.version[:3], "site-packages"))
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 2fec910..147bd6d 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -173,7 +173,7 @@
if sys.platform == "darwin":
framework = get_config_var("PYTHONFRAMEWORK")
if framework:
- return joinuser("~", "Library", framework, "%d.%d"%(
+ return env_base if env_base else joinuser("~", "Library", framework, "%d.%d"%(
sys.version_info[:2]))
return env_base if env_base else joinuser("~", ".local")
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 5695cd7..37ec61a 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -185,13 +185,10 @@
sysconfig.get_config_var("PYTHONFRAMEWORK")):
site.PREFIXES = ['Python.framework']
dirs = site.getsitepackages()
- self.assertEqual(len(dirs), 4)
- wanted = os.path.join('~', 'Library', 'Python',
- sys.version[:3], 'site-packages')
- self.assertEquals(dirs[2], os.path.expanduser(wanted))
+ self.assertEqual(len(dirs), 3)
wanted = os.path.join('/Library', 'Python', sys.version[:3],
'site-packages')
- self.assertEquals(dirs[3], wanted)
+ self.assertEquals(dirs[2], wanted)
class PthFile(object):
"""Helper class for handling testing of .pth files"""