github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Faster cleanup of output folder (PEP-0471)

Browse source 
Use os.scandir() instead of os.listdir()

In accordance with PEP-0471, os.listdir has been marked for discontinued
sometime in the future.

https://peps.python.org/pep-0471/
This commit is contained in:
egberts 2024-07-01 14:07:58 -05:00
commit 22a19068f4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pelican/utils.py
View file

@ -391,19 +391,19 @@ def clean_output_dir(path: str, retention: Iterable[str]) -> None:
return
# remove existing content from output folder unless in retention list
for filename in os.listdir(path):
file = os.path.join(path, filename)
if any(filename == retain for retain in retention):
for dir_entry in os.scandir(path):
file = dir_entry.path
if any(dir_entry.name == retain for retain in retention):
logger.debug(
"Skipping deletion; %s is on retention list: %s", filename, file
"Skipping deletion; %s is on retention list: %s", dir_entry.name, file
)
elif os.path.isdir(file):
elif dir_entry.is_dir():
try:
shutil.rmtree(file)
logger.debug("Deleted directory %s", file)
except Exception as e:
logger.error("Unable to delete directory %s; %s", file, e)
elif os.path.isfile(file) or os.path.islink(file):
elif dir_entry.is_file(follow_symlinks=False) or dir_entry.is_symlink():
try:
os.remove(file)
logger.debug("Deleted file/link %s", file)