[refactor] Callback for disabling or enabling option use a base class

Author: Pierre-Sassoulas

pylint/config/callback_actions.py

@@ -12,7 +12,7 @@
 import argparse
 import sys
 import warnings
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
@@ -365,28 +365,49 @@ def __call__(
         raise NotImplementedError  # pragma: no cover
 
 
-class _DisableAction(_AccessLinterObjectAction):
-    """Callback action for disabling a message."""
+class _XableAction(_AccessLinterObjectAction):
+    """Callback action for enabling or disabling a message."""
 
-    def __call__(
+    def _call(
         self,
-        parser: argparse.ArgumentParser,
-        namespace: argparse.Namespace,
+        xabling_function: Callable[[str], None],
         values: str | Sequence[Any] | None,
-        option_string: str | None = "--disable",
-    ) -> None:
+        option_string: str | None,
+    ):
         assert isinstance(values, (tuple, list))
-        msgids = utils._check_csv(values[0])
-        for msgid in msgids:
+        for msgid in utils._check_csv(values[0]):
             try:
-                self.linter.disable(msgid)
+                xabling_function(msgid)
             except exceptions.UnknownMessageError:
                 self.linter._stashed_messages[self.linter.current_name].append(
                     (option_string, msgid)
                 )
 
+    @abc.abstractmethod
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = "--disable",
+    ) -> None:
+        raise NotImplementedError  # pragma: no cover
 
-class _EnableAction(_AccessLinterObjectAction):
+
+class _DisableAction(_XableAction):
+    """Callback action for disabling a message."""
+
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = "--disable",
+    ) -> None:
+        self._call(self.linter.disable, values, option_string)
+
+
+class _EnableAction(_XableAction):
     """Callback action for enabling a message."""
 
     def __call__(
@@ -396,15 +417,7 @@ def __call__(
         values: str | Sequence[Any] | None,
         option_string: str | None = "--enable",
     ) -> None:
-        assert isinstance(values, (tuple, list))
-        msgids = utils._check_csv(values[0])
-        for msgid in msgids:
-            try:
-                self.linter.enable(msgid)
-            except exceptions.UnknownMessageError:
-                self.linter._stashed_messages[self.linter.current_name].append(
-                    (option_string, msgid)
-                )
+        self._call(self.linter.enable, values, option_string)
 
 
 class _OutputFormatAction(_AccessLinterObjectAction):

pylint/lint/pylinter.py

@@ -1203,13 +1203,12 @@ def add_ignored_message(
             )
 
     def _emit_stashed_messages(self) -> None:
-        for modname in self._stashed_messages:
+        for modname, values in self._stashed_messages.items():
             self.linter.set_current_module(modname)
-            values = self._stashed_messages[modname]
-            for option_string, msg_id in values:
+            for option_string, msgid in values:
                 self.add_message(
                     "bad-option-value",
-                    args=(option_string, msg_id),
+                    args=(option_string, msgid),
                     line=0,
                     confidence=HIGH,
                 )