Minor code and if-statement cleanup
This commit is contained in:
parent
74c8cd5de5
commit
081d098a54
@ -137,7 +137,7 @@ if __name__ == "__main__":
|
|||||||
for ext in args.extensions:
|
for ext in args.extensions:
|
||||||
FD_OPTS.extend(["--extension", ext])
|
FD_OPTS.extend(["--extension", ext])
|
||||||
|
|
||||||
files = set()
|
files = {}
|
||||||
for pattern in args.patterns:
|
for pattern in args.patterns:
|
||||||
cmd = [FD_BIN, *FD_OPTS, pattern]
|
cmd = [FD_BIN, *FD_OPTS, pattern]
|
||||||
files.update(
|
files.update(
|
||||||
@ -165,14 +165,11 @@ if __name__ == "__main__":
|
|||||||
exit(E_USER_RESPONSE_NO)
|
exit(E_USER_RESPONSE_NO)
|
||||||
|
|
||||||
# Remove files first
|
# Remove files first
|
||||||
for f in filter(os.path.isfile, files):
|
for f in [fi for fi in files if os.path.isfile(fi)]:
|
||||||
os.remove(f)
|
os.remove(f)
|
||||||
|
|
||||||
# Check -f, --force-directory-delete option
|
# Check -f, --force-directory-delete option
|
||||||
if args.force_directory_delete:
|
rmdir_func = shutil.rmtree if args.force_directory_delete else os.rmdir
|
||||||
rmdir_func = shutil.rmtree
|
|
||||||
else:
|
|
||||||
rmdir_func = os.rmdir
|
|
||||||
|
|
||||||
for d in filter(os.path.isdir, files):
|
for d in filter(os.path.isdir, files):
|
||||||
try:
|
try:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user