Commit 0beab058 authored by Hynek Schlawack's avatar Hynek Schlawack

#17076: Make copying of xattrs more permissive of missing FS support

Patch by Thomas Wouters.
parent 844b0e69
...@@ -142,7 +142,13 @@ if hasattr(os, 'listxattr'): ...@@ -142,7 +142,13 @@ if hasattr(os, 'listxattr'):
""" """
for name in os.listxattr(src, follow_symlinks=follow_symlinks): try:
names = os.listxattr(src, follow_symlinks=follow_symlinks)
except OSError as e:
if e.errno not in (errno.ENOTSUP, errno.ENODATA):
raise
return
for name in names:
try: try:
value = os.getxattr(src, name, follow_symlinks=follow_symlinks) value = os.getxattr(src, name, follow_symlinks=follow_symlinks)
os.setxattr(dst, name, value, follow_symlinks=follow_symlinks) os.setxattr(dst, name, value, follow_symlinks=follow_symlinks)
......
...@@ -449,6 +449,17 @@ class TestShutil(unittest.TestCase): ...@@ -449,6 +449,17 @@ class TestShutil(unittest.TestCase):
self.assertIn('user.bar', os.listxattr(dst)) self.assertIn('user.bar', os.listxattr(dst))
finally: finally:
os.setxattr = orig_setxattr os.setxattr = orig_setxattr
# the source filesystem not supporting xattrs should be ok, too.
def _raise_on_src(fname, *, follow_symlinks=True):
if fname == src:
raise OSError(errno.ENOTSUP, 'Operation not supported')
return orig_listxattr(fname, follow_symlinks=follow_symlinks)
try:
orig_listxattr = os.listxattr
os.listxattr = _raise_on_src
shutil._copyxattr(src, dst)
finally:
os.listxattr = orig_listxattr
# test that shutil.copystat copies xattrs # test that shutil.copystat copies xattrs
src = os.path.join(tmp_dir, 'the_original') src = os.path.join(tmp_dir, 'the_original')
......
...@@ -163,6 +163,9 @@ Core and Builtins ...@@ -163,6 +163,9 @@ Core and Builtins
Library Library
------- -------
- Issue #17076: Make copying of xattrs more permissive of missing FS support.
Patch by Thomas Wouters.
- Issue #17089: Expat parser now correctly works with string input not only when - Issue #17089: Expat parser now correctly works with string input not only when
an internal XML encoding is UTF-8 or US-ASCII. It now accepts bytes and an internal XML encoding is UTF-8 or US-ASCII. It now accepts bytes and
strings larger than 2 GiB. strings larger than 2 GiB.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment