Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add the ability to use the full path for exclude folder/file #310

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add the ability to use the full path for exclude folder/file #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fafd42
Add the ability to use the full path for exclude folder/file
mirecl Apr 4, 2023
41f5d84
Fix linter pattern.startswith("./")
mirecl Apr 4, 2023
bbac147
Add test case for ./ exclude
mirecl Apr 4, 2023
386f345
Fix linter for pattern.endswith(".py")
mirecl Apr 4, 2023
068185c
Fix test case for exclude
mirecl Apr 4, 2023
1ab3494
Add test_exclude_abs_path
mirecl Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tests/test_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ def test_min_confidence():
)


def test_exclude_abs_path():
assert (
call_vulture(
[
"vulture",
"--exclude=./core.py,./whitelists",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test will succeed even without the exclude. I suggest to use vulture vulture/lines.py --exclude vulture/lines.py instead. And have two tests: returncode == 0 with exclude, returncode != 0 without exclude.

]
)
== 0
)


def test_exclude():
def get_csv(paths):
return ",".join(os.path.join("vulture", path) for path in paths)
Expand Down
6 changes: 6 additions & 0 deletions vulture/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from fnmatch import fnmatch, fnmatchcase
from pathlib import Path
import pkgutil
import os
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort imports alphabetically. And use import os.path instead of import os.

import re
import string
import sys
Expand Down Expand Up @@ -261,6 +262,11 @@ def handle_syntax_error(e):

def scavenge(self, paths, exclude=None):
def prepare_pattern(pattern):
if pattern.startswith("./") is True:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if pattern.startswith("./") is True:
if pattern.startswith("./"):

pattern = os.path.abspath(pattern)
if pattern.endswith(".py") is False:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if pattern.endswith(".py") is False:
if os.path.isdir(pattern):
pattern = os.path.join(pattern, "*")

pattern = f"{pattern}/*"
return pattern
if not any(char in pattern for char in "*?["):
pattern = f"*{pattern}*"
return pattern
Expand Down