Merged revisions 81152 via svnmerge from

brettcannon · brettcannon · commit bbb2d492bc78 · 2010-05-14T00:04:56.000Z
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.
........
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
@@ -181,7 +181,8 @@ def test_getsitepackages(self):
             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)
