[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/7d83d47cfb2e
changeset:   71723:7d83d47cfb2e
parent:      71722:4e4e229b4255
parent:      71721:07d94cf3521e
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Aug 02 22:09:56 2011 -0500
summary:
  merge heads

files:
  Lib/test/test_support.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -58,6 +58,7 @@
         mod_filename = TESTFN + '.py'
         with open(mod_filename, 'w') as f:
             print('foo = 1', file=f)
+        sys.path.insert(0, os.curdir)
         try:
             mod = __import__(TESTFN)
             self.assertIn(TESTFN, sys.modules)
@@ -65,6 +66,7 @@
             support.forget(TESTFN)
             self.assertNotIn(TESTFN, sys.modules)
         finally:
+            del sys.path[0]
             support.unlink(mod_filename)
 
     def test_HOST(self):

-- 
Repository URL: http://hg.python.org/cpython