From 13dae392cba3cef3d83213a0d15b7d8417f64763 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 14:41:18 -0400 Subject: [PATCH] Go with a shorter name --- src/allmydata/scripts/runner.py | 4 ++-- src/allmydata/test/common_util.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index a818aafe8..d9cd6e720 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -129,7 +129,7 @@ def parse_options(argv, config=None): raise return config -def parse_or_exit_with_explanation_with_config(config, argv, stdout, stderr): +def parse_or_exit(config, argv, stdout, stderr): """ Parse Tahoe-LAFS CLI arguments and return a configuration object if they are valid. @@ -338,7 +338,7 @@ def _run_with_reactor(reactor, config, argv, stdout, stderr): argv = list(map(argv_to_unicode, argv)) d = defer.maybeDeferred( - parse_or_exit_with_explanation_with_config, + parse_or_exit, config, argv, stdout, diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index 4db217705..b5229ca11 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -133,7 +133,7 @@ def run_cli_native(verb, *args, **kwargs): d = defer.succeed(argv) d.addCallback( partial( - runner.parse_or_exit_with_explanation_with_config, + runner.parse_or_exit, runner.Options(), ), stdout=stdout,