Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-22 15:22:42 +01:00
Code Issues Projects Releases Wiki Activity

pass bytestringed names to fnmatch_all()

Browse source 
Due to `syspath`, fnmatch ends up comparing strings to bytes, so we must
make sure they are bytes. Fixes #2124
This commit is contained in:
Johnny Robeson 2016-07-20 23:32:24 -04:00
parent e7428972ca
commit f87486c1fa
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
beets/util/__init__.py
View file

@ -267,7 +267,8 @@ def prune_dirs(path, root=None, clutter=('.DS_Store', 'Thumbs.db')):
# Directory gone already.
continue
clutter = [bytestring_path(c) for c in clutter]
if fnmatch_all(os.listdir(directory), clutter):
match_paths = [bytestring_path(d) for d in os.listdir(directory)]
if fnmatch_all(match_paths, clutter):
# Directory contains only clutter (or nothing).
try:
shutil.rmtree(directory)