copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use a python 3.5 compat method to scan dirs

Browse source
This commit is contained in:
Philipp Hörist 2018-08-18 14:06:54 +02:00
parent 76ff47bae2
commit bab834814e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gajim/common/helpers.py
View file

@ -1484,14 +1484,14 @@ def get_available_emoticon_themes():
emoticons_themes.append('font') emoticons_themes.append('font')
files = [] files = []
with os.scandir(configpaths.get('EMOTICONS')) as scan: dir_iterator = os.scandir(configpaths.get('EMOTICONS'))
for entry in scan: for folder in dir_iterator:
if not entry.is_dir(): if not folder.is_dir():
continue continue
with os.scandir(entry.path) as scan_theme: file_iterator = os.scandir(folder.path)
for theme in scan_theme: for theme in file_iterator:
if theme.is_file(): if theme.is_file():
files.append(theme.name) files.append(theme.name)
if os.path.isdir(configpaths.get('MY_EMOTS')): if os.path.isdir(configpaths.get('MY_EMOTS')):
files += os.listdir(configpaths.get('MY_EMOTS')) files += os.listdir(configpaths.get('MY_EMOTS'))