From 6fb49b2e80115947fcd23661286c3232ac6acb22 Mon Sep 17 00:00:00 2001 From: Yevhen Amelin Date: Mon, 18 Mar 2019 20:20:03 +0200 Subject: [PATCH] Remove filter by filename in utils.filenames_from --- src/flake8/utils.py | 5 ++--- tests/unit/test_utils.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/flake8/utils.py b/src/flake8/utils.py index b95d4db..d9d4060 100644 --- a/src/flake8/utils.py +++ b/src/flake8/utils.py @@ -377,9 +377,8 @@ def filenames_from(arg, predicate=None): for filename in files: joined = os.path.join(root, filename) - if predicate(joined) or predicate(filename): - continue - yield joined + if not predicate(joined): + yield joined else: yield arg diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index dcbf8b8..76b3e50 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -186,6 +186,16 @@ def test_filenames_from_a_directory_with_a_predicate(): assert 'flake8/__init__.py' not in filenames +def test_filenames_from_a_directory_with_a_predicate_from_the_current_dir(): + """Verify that predicates filter filenames_from.""" + filenames = list(utils.filenames_from( + arg='./src/flake8', + predicate=lambda filename: filename == '__init__.py', + )) + assert len(filenames) > 2 + assert './src/flake8/__init__.py' in filenames + + def test_filenames_from_a_single_file(): """Verify that we simply yield that filename.""" filenames = list(utils.filenames_from('flake8/__init__.py'))