]> granicus.if.org Git - python/commitdiff
[3.8] bpo-37834: Prevent shutil.rmtree exception (GH-15602) (#15603)
authorŁukasz Langa <lukasz@langa.pl>
Thu, 29 Aug 2019 21:51:19 +0000 (23:51 +0200)
committerGitHub <noreply@github.com>
Thu, 29 Aug 2019 21:51:19 +0000 (23:51 +0200)
when built on non-Windows system without fd system call support,
like older versions of macOS.
(cherry picked from commit 7fcc2088a50a4ecb80e5644cd195bee209c9f979)

Co-authored-by: Ned Deily <nad@python.org>
Lib/shutil.py
Misc/NEWS.d/next/Library/2019-08-29-16-41-36.bpo-37834.FThnsh.rst [new file with mode: 0644]

index 39f793b5f3bde517edb8bbbce22129ff533942d4..561ad71508cc8da01f3a4ca8b51bdcec534fcda9 100644 (file)
@@ -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 (file)
index 0000000..afbbb33
--- /dev/null
@@ -0,0 +1,2 @@
+Prevent shutil.rmtree exception when built on non-Windows system without fd
+system call support, like older versions of macOS.