[Python-3000-checkins] r66543 - in python/branches/py3k: Lib/distutils/tests/test_build_ext.py

hirokazu.yamamoto python-3000-checkins at python.org
Sun Sep 21 22:52:42 CEST 2008


Author: hirokazu.yamamoto
Date: Sun Sep 21 22:52:42 2008
New Revision: 66543

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/tests/test_build_ext.py

Modified: python/branches/py3k/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_ext.py	Sun Sep 21 22:52:42 2008
@@ -62,8 +62,8 @@
         # 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:


More information about the Python-3000-checkins mailing list