From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 20 Jul 2026 22:46:59 +0000 (+0300)
Subject: gh-154307: Fix TemporaryDirectory cleanup on DragonFly BSD (GH-154309)
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=1c1088b1da5a7484b7b04e90ccc47aa362e709eb;p=thirdparty%2FPython%2Fcpython.git

gh-154307: Fix TemporaryDirectory cleanup on DragonFly BSD (GH-154309)

On DragonFly BSD, removing a file or directory with the UF_NOUNLINK flag
fails with EISDIR (IsADirectoryError) instead of EPERM, so the cleanup did
not reset the flags.  Handle IsADirectoryError the same as PermissionError.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---

diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 485038417c65..b5f799f8d685 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -929,7 +929,8 @@ class TemporaryDirectory:
     @classmethod
     def _rmtree(cls, name, ignore_errors=False, repeated=False):
         def onexc(func, path, exc):
-            if isinstance(exc, PermissionError):
+            # On DragonFly BSD, UF_NOUNLINK removal fails with EISDIR, not EPERM.
+            if isinstance(exc, (PermissionError, IsADirectoryError)):
                 if repeated and path == name:
                     if ignore_errors:
                         return
diff --git a/Misc/NEWS.d/next/Library/2026-07-21-01-13-39.gh-issue-154307.UNFKL4.rst b/Misc/NEWS.d/next/Library/2026-07-21-01-13-39.gh-issue-154307.UNFKL4.rst
new file mode 100644
index 000000000000..fdba0c2940f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-07-21-01-13-39.gh-issue-154307.UNFKL4.rst
@@ -0,0 +1,3 @@
+Fix :meth:`tempfile.TemporaryDirectory.cleanup` on DragonFly BSD, where removing
+a file with the ``UF_NOUNLINK`` flag failed with ``EISDIR`` instead of
+``EPERM``.