From f26ea890547492c51c26615b282856674b32c305 Mon Sep 17 00:00:00 2001 From: Christopher Rink Date: Thu, 24 Dec 2020 12:38:40 -0500 Subject: [PATCH] Do a different --- src/basilisp/cli_tools.lpy | 8 +++----- tests/basilisp/test_cli_tools.lpy | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/basilisp/cli_tools.lpy b/src/basilisp/cli_tools.lpy index 6e4f1b87..992b39e6 100644 --- a/src/basilisp/cli_tools.lpy +++ b/src/basilisp/cli_tools.lpy @@ -215,11 +215,9 @@ validate-fn) ;; Prepare the keyword arguments for ArgumentParser.add_argument - default (if-let [val-from-env (some-> (:env argument) (os/getenv))] - val-from-env - (:default argument)) - kwargs {:default default - :const default + kwargs {:default (or (some-> (:env argument) (os/getenv)) + (:default argument)) + :const true :action (cli-tools-action argument) :nargs (if-let [nargs (:nargs argument)] (cond-> nargs (keyword? nargs) (name)) diff --git a/tests/basilisp/test_cli_tools.lpy b/tests/basilisp/test_cli_tools.lpy index 37f81da5..3481348b 100644 --- a/tests/basilisp/test_cli_tools.lpy +++ b/tests/basilisp/test_cli_tools.lpy @@ -75,12 +75,10 @@ {:flags ["--warn-on-shadowed-name"] :help "if provided, emit warnings if a local name is shadowed by another local name" - :nargs 0 :env "BASILISP_WARN_ON_SHADOWED_NAME" :group "compiler flags"} {:flags ["--warn-on-shadowed-var"] :help "if provided, emit warnings if a Var name is shadowed by a local name" - :nargs 0 :env "BASILISP_WARN_ON_SHADOWED_VAR" :group "compiler flags"}]}]})] (are [args ret] (is (= ret (dissoc (parse-args parser args) :handler)))