Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Ensure that test_site actually passes with a framework build

This commit is contained in:
Ronald Oussoren 2010-08-01 09:02:50 +00:00
parent 794f5b3559
commit bda4672b01
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/site.py
View File

@ -295,7 +295,7 @@ def getsitepackages():
# 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"))

2
Lib/sysconfig.py
View File

@ -173,7 +173,7 @@ def _getuserbase():
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")

7
Lib/test/test_site.py
View File

@ -185,13 +185,10 @@ class HelperFunctionsTests(unittest.TestCase):
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"""