From bab834814e1612dd7e3e53270fbffae3a2c2da62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 18 Aug 2018 14:06:54 +0200 Subject: [PATCH] Use a python 3.5 compat method to scan dirs --- gajim/common/helpers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gajim/common/helpers.py b/gajim/common/helpers.py index 0db3555bf..58c6919fb 100644 --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1484,14 +1484,14 @@ def get_available_emoticon_themes(): emoticons_themes.append('font') files = [] - with os.scandir(configpaths.get('EMOTICONS')) as scan: - for entry in scan: - if not entry.is_dir(): - continue - with os.scandir(entry.path) as scan_theme: - for theme in scan_theme: - if theme.is_file(): - files.append(theme.name) + dir_iterator = os.scandir(configpaths.get('EMOTICONS')) + for folder in dir_iterator: + if not folder.is_dir(): + continue + file_iterator = os.scandir(folder.path) + for theme in file_iterator: + if theme.is_file(): + files.append(theme.name) if os.path.isdir(configpaths.get('MY_EMOTS')): files += os.listdir(configpaths.get('MY_EMOTS'))