[Python-checkins] r87693 - in python/branches/release31-maint: Lib/test/test_site.py

[eric.araujo]

Author: eric.araujo
Date: Mon Jan  3 18:53:13 2011
New Revision: 87693

Log:
Merged revisions 87691 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87691 | eric.araujo | 2011-01-03 18:51:11 +0100 (lun., 03 janv. 2011) | 2 lines
  
  Fix test_site for systems without unsetenv.  Reported by Zsolt Cserna.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_site.py

Modified: python/branches/release31-maint/Lib/test/test_site.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_site.py	(original)
+++ python/branches/release31-maint/Lib/test/test_site.py	Mon Jan  3 18:53:13 2011
@@ -154,12 +154,16 @@
         usersite = site.USER_SITE
         self.assertTrue(usersite in sys.path)
 
+        env = os.environ.copy()
         rc = subprocess.call([sys.executable, '-c',
-            'import sys; sys.exit(%r in sys.path)' % usersite])
+            'import sys; sys.exit(%r in sys.path)' % usersite],
+            env=env)
         self.assertEqual(rc, 1)
 
+        env = os.environ.copy()
         rc = subprocess.call([sys.executable, '-s', '-c',
-            'import sys; sys.exit(%r in sys.path)' % usersite])
+            'import sys; sys.exit(%r in sys.path)' % usersite],
+            env=env)
         self.assertEqual(rc, 0)
 
         env = os.environ.copy()