Issue #14662: Prevent shutil failures on OS X when destination does not
support chflag operations. (Patch by Hynek Schlawack)
This commit is contained in:
parent
1682e5d740
commit
5fddf866d8
|
@ -118,8 +118,10 @@ def copystat(src, dst):
|
|||
try:
|
||||
os.chflags(dst, st.st_flags)
|
||||
except OSError as why:
|
||||
if (not hasattr(errno, 'EOPNOTSUPP') or
|
||||
why.errno != errno.EOPNOTSUPP):
|
||||
for err in 'EOPNOTSUPP', 'ENOTSUP':
|
||||
if hasattr(errno, err) and why.errno == getattr(errno, err):
|
||||
break
|
||||
else:
|
||||
raise
|
||||
|
||||
def copy(src, dst):
|
||||
|
|
|
@ -8,6 +8,7 @@ import stat
|
|||
import os
|
||||
import os.path
|
||||
import functools
|
||||
import errno
|
||||
from test import support
|
||||
from test.support import TESTFN
|
||||
from os.path import splitdrive
|
||||
|
@ -307,6 +308,35 @@ class TestShutil(unittest.TestCase):
|
|||
finally:
|
||||
shutil.rmtree(TESTFN, ignore_errors=True)
|
||||
|
||||
@unittest.skipUnless(hasattr(os, 'chflags') and
|
||||
hasattr(errno, 'EOPNOTSUPP') and
|
||||
hasattr(errno, 'ENOTSUP'),
|
||||
"requires os.chflags, EOPNOTSUPP & ENOTSUP")
|
||||
def test_copystat_handles_harmless_chflags_errors(self):
|
||||
tmpdir = self.mkdtemp()
|
||||
file1 = os.path.join(tmpdir, 'file1')
|
||||
file2 = os.path.join(tmpdir, 'file2')
|
||||
self.write_file(file1, 'xxx')
|
||||
self.write_file(file2, 'xxx')
|
||||
|
||||
def make_chflags_raiser(err):
|
||||
ex = OSError()
|
||||
|
||||
def _chflags_raiser(path, flags):
|
||||
ex.errno = err
|
||||
raise ex
|
||||
return _chflags_raiser
|
||||
old_chflags = os.chflags
|
||||
try:
|
||||
for err in errno.EOPNOTSUPP, errno.ENOTSUP:
|
||||
os.chflags = make_chflags_raiser(err)
|
||||
shutil.copystat(file1, file2)
|
||||
# assert others errors break it
|
||||
os.chflags = make_chflags_raiser(errno.EOPNOTSUPP + errno.ENOTSUP)
|
||||
self.assertRaises(OSError, shutil.copystat, file1, file2)
|
||||
finally:
|
||||
os.chflags = old_chflags
|
||||
|
||||
@support.skip_unless_symlink
|
||||
def test_dont_copy_file_onto_symlink_to_itself(self):
|
||||
# bug 851123.
|
||||
|
|
|
@ -63,6 +63,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #14662: Prevent shutil failures on OS X when destination does not
|
||||
support chflag operations. Patch by Hynek Schlawack.
|
||||
|
||||
- Issue #14157: Fix time.strptime failing without a year on February 29th.
|
||||
Patch by Hynek Schlawack.
|
||||
|
||||
|
|
Loading…
Reference in New Issue