summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevhen Amelin <numrut@users.noreply.github.com>2019-03-18 20:20:03 +0200
committerYevhen Amelin <numrut@users.noreply.github.com>2019-03-19 09:59:12 +0200
commit6fb49b2e80115947fcd23661286c3232ac6acb22 (patch)
tree899ac2e0027daf2c8ed82de7ae8f14317b3e8e66
parentd365e06d7ebeceec1b103c9f5c7e738ebe7401b3 (diff)
downloadflake8-6fb49b2e80115947fcd23661286c3232ac6acb22.tar.gz
Remove filter by filename in utils.filenames_from
-rw-r--r--src/flake8/utils.py5
-rw-r--r--tests/unit/test_utils.py10
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'))