Skip to content

remove_dir_tree parameters fix for python 3.10 #4310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
porlows1 merged 1 commit into from
Jun 22, 2026
+8 −1
Merged

remove_dir_tree parameters fix for python 3.10 #4310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tests/functional/utils/test_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import re
import shutil
import stat
import sys
import traceback

import pytest
Expand Down Expand Up @@ -275,8 +276,14 @@ def _make_path_writable_and_retry(func, path, _exc_info):

def remove_dir_tree(dir_path, ignore_errors=False):
"""Remove a directory tree, retrying failed paths after making them writable."""
# shutil.rmtree accepts the `onexc` callback only on Python 3.12+;
# older interpreters expect `onerror`. Both invoke the same (func, path, *) callback.
if sys.version_info >= (3, 12):
rmtree_kwargs = {"onexc": _make_path_writable_and_retry}
else:
rmtree_kwargs = {"onerror": _make_path_writable_and_retry}
try:
shutil.rmtree(dir_path, onexc=_make_path_writable_and_retry)
shutil.rmtree(dir_path, **rmtree_kwargs)
except OSError:
if not ignore_errors:
raise
Expand Down