Use argparse config handler in imports.py & exceptions.py

Author: DanielNoord

pylint/checkers/exceptions.py

@@ -245,6 +245,9 @@ class ExceptionsChecker(checkers.BaseChecker):
         ),
     )
 
+    def __init__(self, linter: "PyLinter") -> None:
+        super().__init__(linter, future_option_parsing=True)
+
     def open(self):
         self._builtin_exceptions = _builtin_exceptions()
         super().open()
@@ -523,7 +526,7 @@ def visit_tryexcept(self, node: nodes.TryExcept) -> None:
                                 "bad-except-order", node=handler.type, args=msg
                             )
                     if (
-                        exception.name in self.config.overgeneral_exceptions
+                        exception.name in self.linter.namespace.overgeneral_exceptions
                         and exception.root().name == utils.EXCEPTIONS_MODULE
                         and not _is_raising(handler.body)
                     ):

pylint/checkers/format.py

@@ -301,7 +301,7 @@ class FormatChecker(BaseTokenChecker):
     )
 
     def __init__(self, linter=None):
-        super().__init__(linter)
+        super().__init__(linter, future_option_parsing=True)
         self._lines = None
         self._visited_lines = None
         self._bracket_stack = [None]
@@ -498,7 +498,7 @@ def process_tokens(self, tokens):
                 handler(tokens, idx)
 
         line_num -= 1  # to be ok with "wc -l"
-        if line_num > self.config.max_module_lines:
+        if line_num > self.linter.namespace.max_module_lines:
             # Get the line where the too-many-lines (or its message id)
             # was disabled or default to 1.
             message_definition = self.linter.msgs_store.get_message_definitions(
@@ -511,7 +511,7 @@ def process_tokens(self, tokens):
             )
             self.add_message(
                 "too-many-lines",
-                args=(line_num, self.config.max_module_lines),
+                args=(line_num, self.linter.namespace.max_module_lines),
                 line=line,
             )
 
@@ -532,7 +532,7 @@ def _check_line_ending(self, line_ending, line_num):
         self._last_line_ending = line_ending
 
         # check if line ending is as expected
-        expected = self.config.expected_line_ending_format
+        expected = self.linter.namespace.expected_line_ending_format
         if expected:
             # reduce multiple \n\n\n\n to one \n
             line_ending = reduce(lambda x, y: x + y if x != y else x, line_ending, "")
@@ -601,13 +601,13 @@ def _check_multi_statement_line(self, node, line):
         if (
             isinstance(node.parent, nodes.If)
             and not node.parent.orelse
-            and self.config.single_line_if_stmt
+            and self.linter.namespace.single_line_if_stmt
         ):
             return
         if (
             isinstance(node.parent, nodes.ClassDef)
             and len(node.parent.body) == 1
-            and self.config.single_line_class_stmt
+            and self.linter.namespace.single_line_class_stmt
         ):
             return
 
@@ -638,8 +638,8 @@ def check_line_ending(self, line: str, i: int) -> None:
 
     def check_line_length(self, line: str, i: int, checker_off: bool) -> None:
         """Check that the line length is less than the authorized value."""
-        max_chars = self.config.max_line_length
-        ignore_long_line = self.config.ignore_long_lines
+        max_chars = self.linter.namespace.max_line_length
+        ignore_long_line = self.linter.namespace.ignore_long_lines
         line = line.rstrip()
         if len(line) > max_chars and not ignore_long_line.search(line):
             if checker_off:
@@ -708,7 +708,7 @@ def check_lines(self, lines: str, lineno: int) -> None:
         # we'll also handle the line ending check here to avoid double-iteration
         # unless the line lengths are suspect
 
-        max_chars = self.config.max_line_length
+        max_chars = self.linter.namespace.max_line_length
 
         split_lines = self.specific_splitlines(lines)
 
@@ -745,7 +745,7 @@ def check_lines(self, lines: str, lineno: int) -> None:
 
     def check_indent_level(self, string, expected, line_num):
         """Return the indent level of the string."""
-        indent = self.config.indent_string
+        indent = self.linter.namespace.indent_string
         if indent == "\\t":  # \t is not interpreted in the configuration file
             indent = "\t"
         level = 0

pylint/config/argument.py

@@ -39,10 +39,18 @@ def _yn_transformer(value: str) -> bool:
     )
 
 
+def _non_empty_string_transformer(value: str) -> str:
+    """Check that a string is not empty and remove quotes."""
+    if not value:
+        raise argparse.ArgumentTypeError("Option cannot be an empty string.")
+    return pylint_utils._unquote(value)
+
+
 _TYPE_TRANSFORMERS: Dict[str, Callable[[str], _ArgumentTypes]] = {
     "choice": str,
     "csv": _csv_transformer,
     "int": int,
+    "non_empty_string": _non_empty_string_transformer,
     "regexp": re.compile,
     "string": str,
     "yn": _yn_transformer,