changeset: 76870:ae141eebcf96 branch: 3.2 parent: 76864:f2ea7505c0d7 user: Ned Deily date: Thu May 10 17:21:23 2012 -0700 files: Lib/shutil.py Lib/test/test_shutil.py Misc/NEWS description: Issue #14662: Prevent shutil failures on OS X when destination does not support chflag operations. (Patch by Hynek Schlawack) diff -r f2ea7505c0d7 -r ae141eebcf96 Lib/shutil.py --- a/Lib/shutil.py Thu May 10 20:17:46 2012 +0200 +++ b/Lib/shutil.py Thu May 10 17:21:23 2012 -0700 @@ -118,8 +118,10 @@ 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): diff -r f2ea7505c0d7 -r ae141eebcf96 Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py Thu May 10 20:17:46 2012 +0200 +++ b/Lib/test/test_shutil.py Thu May 10 17:21:23 2012 -0700 @@ -8,6 +8,7 @@ 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 @@ 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. diff -r f2ea7505c0d7 -r ae141eebcf96 Misc/NEWS --- a/Misc/NEWS Thu May 10 20:17:46 2012 +0200 +++ b/Misc/NEWS Thu May 10 17:21:23 2012 -0700 @@ -63,6 +63,9 @@ 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.