[Python-checkins] r65649 - in python/branches/release25-maint: Lib/shutil.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Tue Aug 12 10:39:33 2008
New Revision: 65649

Log:
#3134: shutil referenced undefined WindowsError symbol
(backport from r65644)


Modified:
   python/branches/release25-maint/Lib/shutil.py
   python/branches/release25-maint/Misc/NEWS

Modified: python/branches/release25-maint/Lib/shutil.py
==============================================================================
--- python/branches/release25-maint/Lib/shutil.py	(original)
+++ python/branches/release25-maint/Lib/shutil.py	Tue Aug 12 10:39:33 2008
@@ -15,6 +15,11 @@
 class Error(EnvironmentError):
     pass
 
+try:
+    WindowsError
+except NameError:
+    WindowsError = None
+
 def copyfileobj(fsrc, fdst, length=16*1024):
     """copy data from file-like object fsrc to file-like object fdst"""
     while 1:
@@ -129,11 +134,12 @@
             errors.extend(err.args[0])
     try:
         copystat(src, dst)
-    except WindowsError:
-        # can't copy file access times on Windows
-        pass
     except OSError, why:
-        errors.extend((src, dst, str(why)))
+        if WindowsError is not None and isinstance(why, WindowsError):
+            # Copying file access times may fail on Windows
+            pass
+        else:
+            errors.extend((src, dst, str(why)))
     if errors:
         raise Error, errors
 

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Aug 12 10:39:33 2008
@@ -77,6 +77,8 @@
 Library
 -------
 
+- Issue #3134: shutil referenced undefined WindowsError symbol.
+
 - Issue #1342811: Fix leak in Tkinter.Menu.delete. Commands associated to
   menu entries were not deleted.