Finalize _parse_command_line_configuration (#6189)

Author: DanielNoord

pylint/config/arguments_manager.py

@@ -5,7 +5,8 @@
 """Arguments manager class used to handle command-line arguments and options."""
 
 import argparse
-from typing import TYPE_CHECKING, Dict, List
+import sys
+from typing import TYPE_CHECKING, Dict, List, Optional
 
 from pylint.config.argument import (
     _Argument,
@@ -33,7 +34,6 @@ def __init__(self) -> None:
         self._arg_parser = argparse.ArgumentParser(
             prog="pylint",
             usage="%(prog)s [options]",
-            allow_abbrev=False,
             formatter_class=_HelpFormatter,
         )
         """The command line argument parser."""
@@ -145,15 +145,17 @@ def _parse_configuration_file(self, config_data: Dict[str, str]) -> None:
         # TODO: This should parse_args instead of parse_known_args
         self.namespace = self._arg_parser.parse_known_args(arguments, self.namespace)[0]
 
-    def _parse_command_line_configuration(self, arguments: List[str]) -> None:
+    def _parse_command_line_configuration(
+        self, arguments: Optional[List[str]] = None
+    ) -> List[str]:
         """Parse the arguments found on the command line into the namespace."""
-        # pylint: disable-next=fixme
-        # TODO: This should parse_args instead of parse_known_args
-        self.namespace = self._arg_parser.parse_known_args(arguments, self.namespace)[0]
+        arguments = sys.argv[1:] if arguments is None else arguments
 
-        # pylint: disable-next=fixme
-        # TODO: This should return a list of arguments with the option arguments removed
-        # just as PyLinter.load_command_line_configuration does
+        self.namespace, parsed_args = self._arg_parser.parse_known_args(
+            arguments, self.namespace
+        )
+
+        return parsed_args
 
     def _parse_plugin_configuration(self) -> None:
         # pylint: disable-next=fixme

pylint/config/config_initialization.py

@@ -70,7 +70,7 @@ def _config_initialization(
 
     # Load command line arguments
     try:
-        parsed_args_list = linter.load_command_line_configuration(args_list)
+        linter.load_command_line_configuration(args_list)
     except SystemExit as exc:
         if exc.code == 2:  # bad options
             exc.code = 32
@@ -89,7 +89,7 @@ def _config_initialization(
 
     # Second we parse any options from the command line, so they can override
     # the configuration file
-    linter._parse_command_line_configuration(args_list)
+    parsed_args_list = linter._parse_command_line_configuration(args_list)
 
     # Lastly we parse any options from plugins
     linter._parse_plugin_configuration()

pylint/config/deprecation_actions.py

@@ -33,7 +33,7 @@ def __init__(
         super().__init__(
             option_strings,
             dest,
-            "+",
+            1,
             const,
             default,
             type,
@@ -78,7 +78,7 @@ def __init__(
         super().__init__(
             option_strings,
             dest,
-            "+",
+            1,
             const,
             default,
             type,

tests/config/test_argparse_config.py

@@ -71,8 +71,8 @@ def test_new_names() -> None:
     @staticmethod
     def test_old_names() -> None:
         """Check that we correctly double assign old name options."""
-        run = Run([EMPTY_MODULE, "--ignore=test"], exit=False)
-        assert run.linter.namespace.ignore == ["test"]
+        run = Run([EMPTY_MODULE, "--ignore=test,test_two"], exit=False)
+        assert run.linter.namespace.ignore == ["test", "test_two"]
         assert run.linter.namespace.ignore == run.linter.namespace.black_list
         assert run.linter.namespace.ignore_patterns == [re.compile("^\\.#")]
         assert (