Skip to content

Change parsing for exclude field #11746

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

Closed
wants to merge 2 commits into from
Closed

Change parsing for exclude field #11746

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace77df
support lists for exclude option in TOML
mawillcockson Dec 14, 2021
fee25c3
style: line too long
mawillcockson Dec 14, 2021
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
5 changes: 5 additions & 0 deletions mypy/config_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ def check_follow_imports(choice: str) -> str:
'disable_error_code': try_split,
'enable_error_code': try_split,
'package_root': try_split,
'exclude': lambda s: [
p.strip() for p in
(s.split('\n') if isinstance(s, str) else s)
if p.strip()
Copy link
Member

Choose a reason for hiding this comment

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

I guess we can turn this into a separate function, so we can skip doing some work twice: p.strip() for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I were to, I'd probably also change the ini exclude function that I stole it from:

mypy/mypy/config_parser.py

Line 129 in fee25c3

'exclude': lambda s: [p.strip() for p in s.split('\n') if p.strip()],

I considered using the try_split() function, but it would not have filtered empty strings, I think:

mypy/mypy/config_parser.py

Lines 44 to 49 in fee25c3

def try_split(v: Union[str, Sequence[str]], split_regex: str = '[,]') -> List[str]:
"""Split and trim a str or list of str into a list of str"""
if isinstance(v, str):
return [p.strip() for p in re.split(split_regex, v)]
return [p.strip() for p in v]

Would this work better?

    'exclude': list(filter(None, try_split('[\n]')))

],
})


Expand Down