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

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 69349e185708dd733e2bfd36b181542257db5ad1..1988ef3a6c2fa9f6841f436b165ae7ab8c9214af 100644 (file)
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -165,13 +165,17 @@ class HelperFunctionsTests(unittest.TestCase):
         usersite = site.USER_SITE
         self.assertIn(usersite, 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, "%r is not in sys.path (sys.exit returned %r)"
                 % (usersite, rc))
 
+        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()