On Fri, Aug 21, 2020 at 12:02 PM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
>
> Use 'choices' instead of the own code to check if the given parameter
> is valid.
>
> I also simplified the help message because, with 'choices', --help
> shows the list of valid parameters:
>
> --log_level {DEBUG,INFO,WARNING,ERROR,CRITICAL}
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
> ---
>
> Changes in v2:
> - New patch
>
> scripts/gen_compile_commands.py | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/scripts/gen_compile_commands.py b/scripts/gen_compile_commands.py
> index 1bcf33a93cb9..535248cf2d7e 100755
> --- a/scripts/gen_compile_commands.py
> +++ b/scripts/gen_compile_commands.py
> @@ -45,24 +45,18 @@ def parse_arguments():
> 'compile_commands.json in the search directory)')
> parser.add_argument('-o', '--output', type=str, help=output_help)
>
> - log_level_help = ('The level of log messages to produce (one of ' +
> - ', '.join(_VALID_LOG_LEVELS) + '; defaults to ' +
> + log_level_help = ('the level of log messages to produce (defaults to ' +
> _DEFAULT_LOG_LEVEL + ')')
> - parser.add_argument(
> - '--log_level', type=str, default=_DEFAULT_LOG_LEVEL,
> - help=log_level_help)
> + parser.add_argument('--log_level', choices=_VALID_LOG_LEVELS,
> + default=_DEFAULT_LOG_LEVEL, help=log_level_help)
>
> args = parser.parse_args()
>
> - log_level = args.log_level
> - if log_level not in _VALID_LOG_LEVELS:
> - raise ValueError('%s is not a valid log level' % log_level)
> -
> directory = args.directory or os.getcwd()
> output = args.output or os.path.join(directory, _DEFAULT_OUTPUT)
> directory = os.path.abspath(directory)
>
> - return log_level, directory, output
> + return args.log_level, directory, output
>
>
> def process_line(root_directory, file_directory, command_prefix, relative_path):
> --
> 2.25.1
>
--
Thanks,
~Nick Desaulniers
