From 4eda979264da8dfb02223de0dda70e462a347bf0 Mon Sep 17 00:00:00 2001 From: Mazin Fadl Date: Thu, 17 Jul 2025 13:31:09 -0400 Subject: [PATCH] Remove glob.glob1 call --- afew/commands.py | 5 +++-- afew/filters/__init__.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/afew/commands.py b/afew/commands.py index 60485927..6417e2a8 100644 --- a/afew/commands.py +++ b/afew/commands.py @@ -5,6 +5,7 @@ import sys import logging import argparse +import os from afew.Database import Database from afew.main import main as inner_main @@ -131,9 +132,9 @@ def main(): logging.basicConfig(level=loglevel) sys.path.insert(0, user_config_dir) - for file_name in glob.glob1(user_config_dir, '*.py'): + for file_name in glob.glob(os.path.join(user_config_dir, '*.py')): logging.info('Importing user filter %r' % (file_name,)) - __import__(file_name[:-3], level=0) + __import__(os.path.basename(file_name)[:-3], level=0) if args.move_mails: args.mail_move_rules = get_mail_move_rules() diff --git a/afew/filters/__init__.py b/afew/filters/__init__.py index 05ef3017..e7099d7a 100644 --- a/afew/filters/__init__.py +++ b/afew/filters/__init__.py @@ -5,5 +5,5 @@ import glob __all__ = list(filename[:-3] - for filename in glob.glob1(os.path.dirname(__file__), '*.py') + for filename in glob.glob(os.path.join(os.path.dirname(__file__), '*.py')) if filename != '__init__.py')