[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/53fc0c475260
changeset:   71177:53fc0c475260
parent:      71174:5133fee2433e
parent:      71176:301c008dd58d
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 03 18:22:14 2011 -0700
summary:
  merge from 3.2

files:
  Lib/test/test_shutil.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -421,7 +421,7 @@
         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.

-- 
Repository URL: http://hg.python.org/cpython