diff -r c85812b0e97d -r b0da15d31aec Lib/test/regrtest.py
--- a/Lib/test/regrtest.py	Wed Feb 29 14:14:00 2012 +0100
+++ b/Lib/test/regrtest.py	Wed Feb 29 19:15:54 2012 +0000
@@ -749,10 +749,10 @@
 if bad:
 print(count(len(bad), "test"), "failed:")
 printlist(bad)
- if environment_changed:
- print("{} altered the execution environment:".format(
- count(len(environment_changed), "test")))
- printlist(environment_changed)
+ if environment_changed:
+ print("{} altered the execution environment:".format(
+ count(len(environment_changed), "test")))
+ printlist(environment_changed)
 if skipped and not quiet:
 print(count(len(skipped), "test"), "skipped:")
 printlist(skipped)
@@ -970,6 +970,7 @@
 'multiprocessing.process._dangling',
 'sysconfig._CONFIG_VARS', 'sysconfig._SCHEMES',
 'packaging.command._COMMANDS', 'packaging.database_caches',
+ 'support.TESTFN',
 )
 
 def get_sys_argv(self):
@@ -1163,6 +1164,21 @@
 sysconfig._SCHEMES._sections.clear()
 sysconfig._SCHEMES._sections.update(saved[2])
 
+ def get_support_TESTFN(self):
+ if os.path.isfile(support.TESTFN):
+ result = 'f'
+ elif os.path.isdir(support.TESTFN):
+ result = 'd'
+ else:
+ result = None
+ return result
+ def restore_support_TESTFN(self, saved_value):
+ if saved_value is None:
+ if os.path.isfile(support.TESTFN):
+ os.unlink(support.TESTFN)
+ elif os.path.isdir(support.TESTFN):
+ shutil.rmtree(support.TESTFN)
+
 
 def resource_info(self):
 for name in self.resources:
diff -r c85812b0e97d -r b0da15d31aec Lib/test/test_base64.py
--- a/Lib/test/test_base64.py	Wed Feb 29 14:14:00 2012 +0100
+++ b/Lib/test/test_base64.py	Wed Feb 29 19:15:54 2012 +0000
@@ -2,6 +2,7 @@
 from test import support
 import base64
 import binascii
+import os
 import sys
 import subprocess
 
@@ -274,6 +275,10 @@
 
 
 class TestMain(unittest.TestCase):
+ def tearDown(self):
+ if os.path.exists(support.TESTFN):
+ os.unlink(support.TESTFN)
+
 def get_output(self, *args, **options):
 args = (sys.executable, '-m', 'base64') + args
 return subprocess.check_output(args, **options)
diff -r c85812b0e97d -r b0da15d31aec Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py	Wed Feb 29 14:14:00 2012 +0100
+++ b/Lib/test/test_mailbox.py	Wed Feb 29 19:15:54 2012 +0000
@@ -7,6 +7,7 @@
 import email.message
 import re
 import io
+import shutil
 import tempfile
 from test import support
 import unittest
@@ -38,12 +39,7 @@
 def _delete_recursively(self, target):
 # Delete a file or delete a directory recursively
 if os.path.isdir(target):
- for path, dirs, files in os.walk(target, topdown=False):
- for name in files:
- os.remove(os.path.join(path, name))
- for name in dirs:
- os.rmdir(os.path.join(path, name))
- os.rmdir(target)
+ shutil.rmtree(target)
 elif os.path.exists(target):
 os.remove(target)
 
@@ -2028,6 +2024,10 @@
 def setUp(self):
 # create a new maildir mailbox to work with:
 self._dir = support.TESTFN
+ if os.path.isdir(self._dir):
+ shutil.rmtree(self._dir)
+ elif os.path.isfile(self._dir):
+ os.unlink(self._dir)
 os.mkdir(self._dir)
 os.mkdir(os.path.join(self._dir, "cur"))
 os.mkdir(os.path.join(self._dir, "tmp"))
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file24687/test-changes.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file24687/test-changes.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>