merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-07-03 18:22:14 -07:00
commit cc78c443f2
1 changed files with 1 additions and 1 deletions

View File

@ -421,7 +421,7 @@ class TestShutil(unittest.TestCase):
self.assertEqual(os.stat(file1).st_mode, os.stat(file2).st_mode)
@unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.chmod')
@unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.utime')
@unittest.skipUnless(hasattr(os, 'utime'), 'requires os.utime')
def test_copy2(self):
# Ensure that the copied file exists and has the same mode and
# modification time bits.