refactor out define_options

Author: wyattscarpenter

docs/source/html_builder.py

@@ -11,7 +11,7 @@
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.environment import BuildEnvironment
 
-from mypy.main import process_options
+from mypy.main import define_options
 
 
 class MypyHTMLBuilder(StandaloneHTMLBuilder):
@@ -28,8 +28,8 @@ def write_doc(self, docname: str, doctree: document) -> None:
         self._ref_to_doc.update({_id: docname for _id in doctree.ids})
 
     def _add_strict_list(self) -> None:
-        strict_flags: list[str] = []
-        process_options(["-c", "pass"], list_to_fill_with_strict_flags=strict_flags)
+        strict_flags: list[str]
+        _, strict_flags, _ = define_options()
         strict_part = ", ".join(f":option:`{s} <mypy {s}>`" for s in strict_flags)
         if (
             not strict_part

mypy/main.py

@@ -461,32 +461,12 @@ def __call__(
         parser._print_message(formatter.format_help(), self.stdout)
         parser.exit()
 
-
-def process_options(
-    args: list[str],
-    stdout: TextIO | None = None,
-    stderr: TextIO | None = None,
-    require_targets: bool = True,
-    server_options: bool = False,
-    fscache: FileSystemCache | None = None,
-    program: str = "mypy",
-    header: str = HEADER,
-    list_to_fill_with_strict_flags: list[str] | None = None,
-) -> tuple[list[BuildSource], Options]:
-    """Parse command line arguments.
-
-    If a FileSystemCache is passed in, and package_root options are given,
-    call fscache.set_package_root() to set the cache's package root.
-
-    Returns a tuple of: a list of source files, an Options collected from flags.
-
-    If list_to_fill_with_strict_flags is provided and not none,
-      then that list will be extended with the computed list of flags that --strict enables
-      (as a sort of secret return option).
-    """
-    stdout = stdout or sys.stdout
-    stderr = stderr or sys.stderr
-
+def define_options(program: str = "mypy", header: str = HEADER, stdout: TextIO = sys.stdout, stderr: TextIO = sys.stderr, server_options: bool = False) -> tuple[CapturableArgumentParser, list[str], list[tuple[str, bool]]]:
+    """Define the options in the parser (by calling a bunch of methods that express/build our desired command-line flags).
+    Returns a tuple of:
+      a parser object, that can parse command line arguments to mypy (expected consumer: main's process_options),
+      a list of what flags are strict (expected consumer: docs' html_builder's _add_strict_list),
+      strict_flag_assignments (expected consumer: main's process_options)."""
     parser = CapturableArgumentParser(
         prog=program,
         usage=header,
@@ -1328,6 +1308,29 @@ def add_invertible_flag(
         dest="special-opts:files",
         help="Type-check given files or directories",
     )
+    return parser, strict_flag_names, strict_flag_assignments
+
+def process_options(
+    args: list[str],
+    stdout: TextIO | None = None,
+    stderr: TextIO | None = None,
+    require_targets: bool = True,
+    server_options: bool = False,
+    fscache: FileSystemCache | None = None,
+    program: str = "mypy",
+    header: str = HEADER,
+) -> tuple[list[BuildSource], Options]:
+    """Parse command line arguments.
+
+    If a FileSystemCache is passed in, and package_root options are given,
+    call fscache.set_package_root() to set the cache's package root.
+
+    Returns a tuple of: a list of source files, an Options collected from flags.
+    """
+    stdout = stdout if stdout is not None else sys.stdout
+    stderr = stderr if stderr is not None else sys.stderr
+
+    parser, _, strict_flag_assignments = define_options(header, program, stdout, stderr, server_options)
 
     # Parse arguments once into a dummy namespace so we can get the
     # filename for the config file and know if the user requested all strict options.
@@ -1520,8 +1523,6 @@ def set_strict_flags() -> None:
         # exceptions of different types.
         except InvalidSourceList as e2:
             fail(str(e2), stderr, options)
-    if list_to_fill_with_strict_flags is not None:
-        list_to_fill_with_strict_flags.extend(strict_flag_names)
     return targets, options