[Python-checkins] r79301 - in python/branches/py3k: Lib/shutil.py Misc/NEWS

Mon Mar 22 21:11:10 CET 2010

Author: antoine.pitrou
Date: Mon Mar 22 21:11:09 2010
New Revision: 79301
Log:
Merged revisions 79299 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r79299 | antoine.pitrou | 2010年03月22日 20:59:46 +0100 (lun., 22 mars 2010) | 5 lines
 
 Issue #7512: shutil.copystat() could raise an OSError when the filesystem
 didn't support chflags() (for example ZFS under FreeBSD). The error is
 now silenced.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/shutil.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/shutil.py
==============================================================================

--- python/branches/py3k/Lib/shutil.py	(original)
+++ python/branches/py3k/Lib/shutil.py	Mon Mar 22 21:11:09 2010
@@ -11,6 +11,7 @@
 import fnmatch
 from warnings import warn
 import collections
+import errno
 
 try:
 from pwd import getpwnam
@@ -105,8 +106,11 @@
 if hasattr(os, 'chmod'):
 os.chmod(dst, mode)
 if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
- os.chflags(dst, st.st_flags)
-
+ try:
+ os.chflags(dst, st.st_flags)
+ except OSError as why:
+ if not hasattr(errno, 'EOPNOTSUPP') or why.errno != errno.EOPNOTSUPP:
+ raise
 
 def copy(src, dst):
 """Copy data and mode bits ("cp src dst").
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Mar 22 21:11:09 2010
@@ -287,6 +287,10 @@
 Library
 -------
 
+- Issue #7512: shutil.copystat() could raise an OSError when the filesystem
+ didn't support chflags() (for example ZFS under FreeBSD). The error is
+ now silenced.
+
 - Issue #7860: platform.uname now reports the correct 'machine' type
 when Python is running in WOW64 mode on 64 bit Windows.
 
