Merge branch 'tickets/DM-26597'

lsst · Sep 16, 2020 · f127b1e · f127b1e
2 parents c5c227b + b606c5a
commit f127b1e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/python/lsst/daf/butler/cli/opt/options.py b/python/lsst/daf/butler/cli/opt/options.py
@@ -24,7 +24,6 @@
 from functools import partial
 
 from ..utils import MWOptionDecorator, split_commas, split_kv, unwrap
-from lsst.daf.butler.core.utils import iterable
 from lsst.daf.butler.registry import CollectionType
 
 
@@ -67,16 +66,17 @@ def makeCollectionType(context, param, value):
                                         multiple=True)
 
 
+logLevelChoices = ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"]
 log_level_option = MWOptionDecorator("--log-level",
                                      callback=partial(split_kv,
-                                                      choice=click.Choice(["CRITICAL", "ERROR", "WARNING",
-                                                                          "INFO", "DEBUG"],
+                                                      choice=click.Choice(logLevelChoices,
                                                                           case_sensitive=False),
                                                       normalize=True,
                                                       unseparated_okay=True),
-                                     default=iterable("WARNING"),
-                                     help="The Python log level to use.",
+                                     help="The logging level. "
+                                          f"Supported levels are [{'|'.join(logLevelChoices)}]",
                                      is_eager=True,
+                                     metavar="LEVEL|COMPONENT=LEVEL",
                                      multiple=True)