summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-09-21 20:52:42 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-09-21 20:52:42 (GMT)
commit956ffd75af881353fd59d61eb787df1512f0b59e (patch)
treee574119c8c49703afcb34a94c23c927622043d8d
parentdc529c1e1faa67af60689527ee7b57b7419730e9 (diff)
downloadcpython-956ffd75af881353fd59d61eb787df1512f0b59e.zip
cpython-956ffd75af881353fd59d61eb787df1512f0b59e.tar.gz
cpython-956ffd75af881353fd59d61eb787df1512f0b59e.tar.bz2
Merged revisions 66542 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66542 | hirokazu.yamamoto | 2008-09-22 05:48:41 +0900 | 2 lines Issue #3925: Ignores shutil.rmtree error on cygwin too. Reviewed by Benjamin Peterson. ........
-rw-r--r--Lib/distutils/tests/test_build_ext.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 20c1074..552a3d1 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -62,8 +62,8 @@ class BuildExtTestCase(unittest.TestCase):
# Get everything back to normal
support.unload('xx')
sys.path = self.sys_path
- # XXX on Windows the test leaves a directory with xx.pyd in TEMP
- shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+ # XXX on Windows the test leaves a directory with xx module in TEMP
+ shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
def test_suite():
if not sysconfig.python_build: