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

[georg.brandl]

http://hg.python.org/cpython/rev/016087c46600
changeset:   78762:016087c46600
parent:      78760:afa3dedfee18
parent:      78761:a2bf95458eed
user:        Georg Brandl <georg at python.org>
date:        Sat Aug 25 10:12:47 2012 +0200
summary:
  merge with 3.2

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


diff --git a/Lib/shutil.py b/Lib/shutil.py
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -332,7 +332,7 @@
             # Copying file access times may fail on Windows
             pass
         else:
-            errors.extend((src, dst, str(why)))
+            errors.append((src, dst, str(why)))
     if errors:
         raise Error(errors)
     return dst

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