]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-154307: Fix TemporaryDirectory cleanup on DragonFly BSD (GH-154309)
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 20 Jul 2026 22:46:59 +0000 (01:46 +0300)
committerGitHub <noreply@github.com>
Mon, 20 Jul 2026 22:46:59 +0000 (22:46 +0000)
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>
Lib/tempfile.py
Misc/NEWS.d/next/Library/2026-07-21-01-13-39.gh-issue-154307.UNFKL4.rst [new file with mode: 0644]

index 485038417c65c662a7ea67967d2a7ffb1612e769..b5f799f8d685545e991b27a77bdca333e4f624ac 100644 (file)
@@ -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 (file)
index 0000000..fdba0c2
--- /dev/null
@@ -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``.