From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 21 Jul 2026 03:51:33 +0000 (+0200) Subject: [3.14] gh-154308: Clear file flags in os_helper.rmtree() (GH-154310) (GH-154315) X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=0df683f36cde812e11ee5a19a4f3da3d456b9b20;p=thirdparty%2FPython%2Fcpython.git [3.14] gh-154308: Clear file flags in os_helper.rmtree() (GH-154310) (GH-154315) On BSD systems a test may leave behind files or directories with flags such as UF_IMMUTABLE or UF_NOUNLINK set, which prevent the directory from being modified or removed. Clear the flags before removing, so cleaning up a temporary directory does not fail. (cherry picked from commit 1f649fecb645d70b9c48268839e4177d8fe4e1d1) Co-authored-by: Serhiy Storchaka Co-authored-by: Claude Opus 4.8 (1M context) --- diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index 2c45fe2369ec..daf6060940e9 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -467,12 +467,23 @@ else: def _rmtree_inner(path): from test.support import _force_run + # Clear file flags (e.g. UF_IMMUTABLE, UF_NOUNLINK on BSD). + if hasattr(os, 'chflags'): + try: + os.chflags(path, 0) + except OSError: + pass for name in _force_run(path, os.listdir, path): fullname = os.path.join(path, name) try: mode = os.lstat(fullname).st_mode except OSError: mode = 0 + if hasattr(os, 'lchflags'): + try: + os.lchflags(fullname, 0) + except OSError: + pass if stat.S_ISDIR(mode): _rmtree_inner(fullname) _force_run(path, os.rmdir, fullname)