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.

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

Display list of available formatters with help for --format #1624

Merged
merged 1 commit into from
Oct 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/flake8/main/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def register_plugin_options(self) -> None:
version=flake8.__version__,
plugin_versions=self.plugins.versions_str(),
parents=[self.prelim_arg_parser],
formatter_names=list(self.plugins.reporters),
)
options.register_default_options(self.option_manager)
self.option_manager.register_plugins(self.plugins)
Expand Down
10 changes: 9 additions & 1 deletion src/flake8/main/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,15 @@ def register_default_options(option_manager: OptionManager) -> None:
metavar="format",
default="default",
parse_from_config=True,
help="Format errors according to the chosen formatter.",
help=(
f"Format errors according to the chosen formatter "
f"({', '.join(sorted(option_manager.formatter_names))}) "
f"or a format string containing %%-style "
f"mapping keys (code, col, path, row, text). "
f"For example, "
f"``--format=pylint`` or ``--format='%%(path)s %%(code)s'``. "
f"(Default: %(default)s)"
),
)

add_option(
Expand Down
2 changes: 2 additions & 0 deletions src/flake8/options/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ def __init__(
version: str,
plugin_versions: str,
parents: list[argparse.ArgumentParser],
formatter_names: list[str],
) -> None:
"""Initialize an instance of an OptionManager.

Expand All @@ -330,6 +331,7 @@ def __init__(
A list of ArgumentParser objects whose arguments should also be
included.
"""
self.formatter_names = formatter_names
self.parser = argparse.ArgumentParser(
prog="flake8",
usage="%(prog)s [options] file file ...",
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def optmanager():
version="3.0.0",
plugin_versions="",
parents=[],
formatter_names=[],
)
options.register_default_options(option_manager)
return option_manager
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,3 +406,13 @@ def test_config_file_not_found(tmpdir, capsys):
out, err = capsys.readouterr()
assert out == expected
assert err == ""


def test_format_option_help(capsys):
"""Test that help displays list of available formatters."""
with pytest.raises(SystemExit):
cli.main(["--help"])

out, err = capsys.readouterr()
assert "(default, pylint, quiet-filename, quiet-nothing)" in out
assert err == ""
1 change: 1 addition & 0 deletions tests/integration/test_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def test_local_plugin_can_add_option(local_config):
version="123",
plugin_versions="",
parents=[stage1_parser],
formatter_names=[],
)
register_default_options(option_manager)
option_manager.register_plugins(loaded_plugins)
Expand Down
10 changes: 8 additions & 2 deletions tests/unit/test_option_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
def optmanager():
"""Generate a simple OptionManager with default test arguments."""
return manager.OptionManager(
version=TEST_VERSION, plugin_versions="", parents=[]
version=TEST_VERSION,
plugin_versions="",
parents=[],
formatter_names=[],
)


Expand All @@ -34,7 +37,10 @@ def test_option_manager_including_parent_options():

# WHEN
optmanager = manager.OptionManager(
version=TEST_VERSION, plugin_versions="", parents=[parent_parser]
version=TEST_VERSION,
plugin_versions="",
parents=[parent_parser],
formatter_names=[],
)
options = optmanager.parse_args(["--parent", "foo"])

Expand Down
4 changes: 3 additions & 1 deletion tests/unit/test_options_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ def test_load_extra_config_utf8(tmpdir):

@pytest.fixture
def opt_manager():
ret = OptionManager(version="123", plugin_versions="", parents=[])
ret = OptionManager(
version="123", plugin_versions="", parents=[], formatter_names=[]
)
register_default_options(ret)
return ret

Expand Down