From 0ca06801654acaeb3c99440ce7073c9fff7395c1 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 23 May 2021 21:40:48 +0200 Subject: [PATCH] Simplify --version --- PFERD/__main__.py | 5 ----- PFERD/cli/parser.py | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/PFERD/__main__.py b/PFERD/__main__.py index 9bc2974..8cb6a11 100644 --- a/PFERD/__main__.py +++ b/PFERD/__main__.py @@ -8,7 +8,6 @@ from .config import Config, ConfigDumpError, ConfigLoadError, ConfigOptionError from .logging import log from .pferd import Pferd, PferdLoadError from .transformer import RuleParseError -from .version import NAME, VERSION def load_config_parser(args: argparse.Namespace) -> configparser.ConfigParser: @@ -81,10 +80,6 @@ def dump_config(args: argparse.Namespace, config: Config) -> None: def main() -> None: args = PARSER.parse_args() - if args.version: - print(f"{NAME} {VERSION}") - exit() - # Configuring logging happens in two stages because CLI args have # precedence over config file options and loading the config already # produces some kinds of log messages (usually only explain()-s). diff --git a/PFERD/cli/parser.py b/PFERD/cli/parser.py index bd62b6e..af5c340 100644 --- a/PFERD/cli/parser.py +++ b/PFERD/cli/parser.py @@ -3,6 +3,7 @@ import configparser from pathlib import Path from ..output_dir import OnConflict, Redownload +from ..version import NAME, VERSION CRAWLER_PARSER = argparse.ArgumentParser(add_help=False) CRAWLER_PARSER_GROUP = CRAWLER_PARSER.add_argument_group( @@ -70,8 +71,8 @@ PARSER = argparse.ArgumentParser() PARSER.set_defaults(command=None) PARSER.add_argument( "--version", - action="store_true", - help="print version and exit" + action="version", + version=f"{NAME} {VERSION}", ) PARSER.add_argument( "--config", "-c",