[Python-checkins] r81384 - python/branches/release31-maint/Lib/test/test_warnings.py
victor.stinner
python-checkins at python.org
Thu May 20 23:42:00 CEST 2010
Author: victor.stinner
Date: Thu May 20 23:42:00 2010
New Revision: 81384
Log:
Fix test_warnings on Windows (don't change current directory)
Modified:
python/branches/release31-maint/Lib/test/test_warnings.py
Modified: python/branches/release31-maint/Lib/test/test_warnings.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_warnings.py (original)
+++ python/branches/release31-maint/Lib/test/test_warnings.py Thu May 20 23:42:00 2010
@@ -4,7 +4,6 @@
from io import StringIO
import sys
import unittest
-import shutil
import tempfile
import subprocess
from test import support
@@ -678,12 +677,11 @@
# "import encodings" emits a warning whereas the warnings is not loaded
# or not completly loaded (warnings imports indirectly encodings by
# importing linecache) yet
- old_cwd = os.getcwd()
+ cwd = tempfile.mkdtemp()
try:
- cwd = tempfile.mkdtemp()
+ encodings = os.path.join(cwd, 'encodings')
+ os.mkdir(encodings)
try:
- os.chdir(cwd)
- os.mkdir('encodings')
env = os.environ.copy()
env['PYTHONPATH'] = cwd
@@ -697,9 +695,9 @@
env=env)
self.assertEqual(retcode, 0)
finally:
- shutil.rmtree(cwd)
+ os.rmdir(encodings)
finally:
- os.chdir(old_cwd)
+ os.rmdir(cwd)
def test_main():
py_warnings.onceregistry.clear()
More information about the Python-checkins
mailing list