diff options
| author | Brett Cannon <bcannon@gmail.com> | 2010-05-14 00:04:56 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2010-05-14 00:04:56 (GMT) |
| commit | bbb2d492bc781d8e0b01ed932e51cfcfd2f35545 (patch) | |
| tree | 92ceae1abb5bf77e453647f2ea1b75974bae1286 /Lib | |
| parent | f9a444223cdd53c6daa6dedea3d956d32174ec8f (diff) | |
| download | cpython-bbb2d492bc781d8e0b01ed932e51cfcfd2f35545.zip cpython-bbb2d492bc781d8e0b01ed932e51cfcfd2f35545.tar.gz cpython-bbb2d492bc781d8e0b01ed932e51cfcfd2f35545.tar.bz2 | |
Merged revisions 81152 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81152 | brett.cannon | 2010-05-13 16:59:41 -0700 (Thu, 13 May 2010) | 3 lines
test_site was failing under darwin for non-framework builds because a test was
assuming framework-specific site-packages directories were being used.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_site.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 904bcef..5695cd7 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -181,7 +181,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) |