[Python-checkins] r81153 - in python/branches/py3k: Lib/test/test_site.py

[brett.cannon]

Author: brett.cannon
Date: Fri May 14 02:04:56 2010
New Revision: 81153

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_site.py

Modified: python/branches/py3k/Lib/test/test_site.py
==============================================================================
--- python/branches/py3k/Lib/test/test_site.py	(original)
+++ python/branches/py3k/Lib/test/test_site.py	Fri May 14 02:04:56 2010
@@ -181,7 +181,8 @@
             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)