summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-07-04 01:22:14 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-07-04 01:22:14 (GMT)
commitcc78c443f2e6d2b2d273195a6d5210ed9fc260ee (patch)
tree3d08be3263668e80ee2d0f4a6d39b172e18c7c93 /Lib
parent5a21e83119ddb2d641ce9937e245ea94caadf5a6 (diff)
parent0c2dba5726ca5aee41ad7e7920f0c07a548f0a49 (diff)
downloadcpython-cc78c443f2e6d2b2d273195a6d5210ed9fc260ee.zip
cpython-cc78c443f2e6d2b2d273195a6d5210ed9fc260ee.tar.gz
cpython-cc78c443f2e6d2b2d273195a6d5210ed9fc260ee.tar.bz2
merge from 3.2
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_shutil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index b17ff3e..b64cc3a 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -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.