From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 14 May 2010 00:04:56 +0000 (+0000)
Subject: Merged revisions 81152 via svnmerge from
X-Git-Tag: v3.2a1~817
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbb2d492bc781d8e0b01ed932e51cfcfd2f35545;p=python

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.
........
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 904bcef780..5695cd734d 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)