Fix confidence argument type

Author: DanielNoord

pylint/config/argument.py

@@ -13,6 +13,7 @@
 import re
 from typing import Callable, Dict, List, Optional, Pattern, Sequence, Tuple, Union
 
+from pylint import interfaces
 from pylint import utils as pylint_utils
 
 _ArgumentTypes = Union[
@@ -28,6 +29,17 @@
 """List of possible argument types."""
 
 
+def _confidence_transformer(value: str) -> Sequence[str]:
+    """Transforms a comma separated string of confidence values."""
+    values = pylint_utils._check_csv(value)
+    for confidence in values:
+        if confidence not in interfaces.CONFIDENCE_LEVEL_NAMES:
+            raise argparse.ArgumentTypeError(
+                f"{value} should be in {*interfaces.CONFIDENCE_LEVEL_NAMES,}"
+            )
+    return values
+
+
 def _csv_transformer(value: str) -> Sequence[str]:
     """Transforms a comma separated string."""
     return pylint_utils._check_csv(value)
@@ -94,7 +106,7 @@ def _regexp_paths_csv_transfomer(value: str) -> Sequence[Pattern[str]]:
     "csv": _csv_transformer,
     "float": float,
     "int": int,
-    "multiple_choice": _csv_transformer,
+    "confidence": _confidence_transformer,
     "non_empty_string": _non_empty_string_transformer,
     "py_version": _py_version_transformer,
     "regexp": re.compile,

pylint/config/option.py

@@ -106,6 +106,9 @@ def _py_version_validator(_, name, value):
     "csv": _csv_validator,
     "yn": _yn_validator,
     "choice": lambda opt, name, value: _choice_validator(opt["choices"], name, value),
+    "confidence": lambda opt, name, value: _multiple_choice_validator(
+        opt["choices"], name, value
+    ),
     "multiple_choice": lambda opt, name, value: _multiple_choice_validator(
         opt["choices"], name, value
     ),
@@ -148,6 +151,7 @@ class Option(optparse.Option):
         "regexp_paths_csv",
         "csv",
         "yn",
+        "confidence",
         "multiple_choice",
         "non_empty_string",
         "py_version",
@@ -159,6 +163,7 @@ class Option(optparse.Option):
     TYPE_CHECKER["regexp_paths_csv"] = _regexp_paths_csv_validator
     TYPE_CHECKER["csv"] = _csv_validator
     TYPE_CHECKER["yn"] = _yn_validator
+    TYPE_CHECKER["confidence"] = _multiple_choices_validating_option
     TYPE_CHECKER["multiple_choice"] = _multiple_choices_validating_option
     TYPE_CHECKER["non_empty_string"] = _non_empty_string_validator
     TYPE_CHECKER["py_version"] = _py_version_validator
@@ -169,7 +174,7 @@ def __init__(self, *opts, **attrs):
             self.help = optparse.SUPPRESS_HELP
 
     def _check_choice(self):
-        if self.type in {"choice", "multiple_choice"}:
+        if self.type in {"choice", "multiple_choice", "confidence"}:
             if self.choices is None:
                 raise optparse.OptionError(
                     "must supply a list of choices for type 'choice'", self

pylint/interfaces.py

@@ -24,6 +24,7 @@
     "INFERENCE_FAILURE",
     "UNDEFINED",
     "CONFIDENCE_LEVELS",
+    "CONFIDENCE_LEVEL_NAMES",
 )
 
 Confidence = namedtuple("Confidence", ["name", "description"])
@@ -39,6 +40,7 @@
 UNDEFINED = Confidence("UNDEFINED", "Warning without any associated confidence level.")
 
 CONFIDENCE_LEVELS = [HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, UNDEFINED]
+CONFIDENCE_LEVEL_NAMES = [i.name for i in CONFIDENCE_LEVELS]
 
 
 class Interface:

pylint/lint/pylinter.py

@@ -355,10 +355,10 @@ def make_options() -> Tuple[Tuple[str, OptionDict], ...]:
             (
                 "confidence",
                 {
-                    "type": "multiple_choice",
+                    "type": "confidence",
                     "metavar": "<levels>",
-                    "default": "",
-                    "choices": [c.name for c in interfaces.CONFIDENCE_LEVELS],
+                    "default": interfaces.CONFIDENCE_LEVEL_NAMES,
+                    "choices": interfaces.CONFIDENCE_LEVEL_NAMES,
                     "group": "Messages control",
                     "help": "Only show warnings with the listed confidence levels."
                     f" Leave empty to show all. Valid levels: {', '.join(c.name for c in interfaces.CONFIDENCE_LEVELS)}.",

pylintrc

@@ -74,7 +74,7 @@ fail-on=
 
 # Only show warnings with the listed confidence levels. Leave empty to show
 # all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
+# confidence=
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option