From: Ned Deily Date: Thu, 29 Aug 2019 21:20:03 +0000 (-0400) Subject: bpo-37834: Prevent shutil.rmtree exception (GH-15602) X-Git-Tag: v3.9.0a1~731 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fcc2088a50a4ecb80e5644cd195bee209c9f979;p=thirdparty%2FPython%2Fcpython.git bpo-37834: Prevent shutil.rmtree exception (GH-15602) when built on non-Windows system without fd system call support, like older versions of macOS. --- diff --git a/Lib/shutil.py b/Lib/shutil.py index 39f793b5f3bd..561ad71508cc 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -544,7 +544,7 @@ def copytree(src, dst, symlinks=False, ignore=None, copy_function=copy2, ignore_dangling_symlinks=ignore_dangling_symlinks, dirs_exist_ok=dirs_exist_ok) -if hasattr(stat, 'FILE_ATTRIBUTE_REPARSE_POINT'): +if hasattr(os.stat_result, 'st_file_attributes'): # Special handling for directory junctions to make them behave like # symlinks for shutil.rmtree, since in general they do not appear as # regular links. diff --git a/Misc/NEWS.d/next/Library/2019-08-29-16-41-36.bpo-37834.FThnsh.rst b/Misc/NEWS.d/next/Library/2019-08-29-16-41-36.bpo-37834.FThnsh.rst new file mode 100644 index 000000000000..afbbb3313a5b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-08-29-16-41-36.bpo-37834.FThnsh.rst @@ -0,0 +1,2 @@ +Prevent shutil.rmtree exception when built on non-Windows system without fd +system call support, like older versions of macOS.