Simplify --version

This commit is contained in:
Joscha 2021-05-23 21:40:48 +02:00
parent ce1dbda5b4
commit 0ca0680165
2 changed files with 3 additions and 7 deletions

View File

@ -8,7 +8,6 @@ from .config import Config, ConfigDumpError, ConfigLoadError, ConfigOptionError
from .logging import log from .logging import log
from .pferd import Pferd, PferdLoadError from .pferd import Pferd, PferdLoadError
from .transformer import RuleParseError from .transformer import RuleParseError
from .version import NAME, VERSION
def load_config_parser(args: argparse.Namespace) -> configparser.ConfigParser: 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: def main() -> None:
args = PARSER.parse_args() args = PARSER.parse_args()
if args.version:
print(f"{NAME} {VERSION}")
exit()
# Configuring logging happens in two stages because CLI args have # Configuring logging happens in two stages because CLI args have
# precedence over config file options and loading the config already # precedence over config file options and loading the config already
# produces some kinds of log messages (usually only explain()-s). # produces some kinds of log messages (usually only explain()-s).

View File

@ -3,6 +3,7 @@ import configparser
from pathlib import Path from pathlib import Path
from ..output_dir import OnConflict, Redownload from ..output_dir import OnConflict, Redownload
from ..version import NAME, VERSION
CRAWLER_PARSER = argparse.ArgumentParser(add_help=False) CRAWLER_PARSER = argparse.ArgumentParser(add_help=False)
CRAWLER_PARSER_GROUP = CRAWLER_PARSER.add_argument_group( CRAWLER_PARSER_GROUP = CRAWLER_PARSER.add_argument_group(
@ -70,8 +71,8 @@ PARSER = argparse.ArgumentParser()
PARSER.set_defaults(command=None) PARSER.set_defaults(command=None)
PARSER.add_argument( PARSER.add_argument(
"--version", "--version",
action="store_true", action="version",
help="print version and exit" version=f"{NAME} {VERSION}",
) )
PARSER.add_argument( PARSER.add_argument(
"--config", "-c", "--config", "-c",