Account for strict flag override

python · hasier · May 23, 2025 · May 23, 2025 · May 23, 2025 · May 27, 2025
commit a0c4d6c862c270c6033003a6fe23a6b46f9fc99e
diff --git a/mypy/config_parser.py b/mypy/config_parser.py
@@ -301,9 +301,15 @@ def parse_config_file(
    stdout = stdout or sys.stdout
    stderr = stderr or sys.stderr

+    strict_found = False
+
+    def set_strict(value: bool) -> None:
+        nonlocal strict_found
+        strict_found = value
+
    ret = _parse_and_extend_config_file(
        template=options,
-        set_strict_flags=set_strict_flags,
+        set_strict=set_strict,
        filename=filename,
        stdout=stdout,
        stderr=stderr,
@@ -315,6 +321,9 @@ def parse_config_file(

    file_read, mypy_updates, mypy_report_dirs, module_updates = ret

+    if strict_found:
+        set_strict_flags()
+
    options.config_file = file_read

    for k, v in mypy_updates.items():
@@ -344,7 +353,7 @@ def _merge_updates(existing: dict[str, object], new: dict[str, object]) -> None:

 def _parse_and_extend_config_file(
    template: Options,
-    set_strict_flags: Callable[[], None],
+    set_strict: Callable[[bool], None],
    filename: str | None,
    stdout: TextIO,
    stderr: TextIO,
@@ -384,7 +393,7 @@ def _parse_and_extend_config_file(
        if extend:
            parse_ret = _parse_and_extend_config_file(
                template=template,
-                set_strict_flags=set_strict_flags,
+                set_strict=set_strict,
                # refer to extend relative to directory where we found current config
                filename=os.path.relpath(
                    os.path.normpath(
@@ -403,7 +412,7 @@ def _parse_and_extend_config_file(

        prefix = f"{file_read}: [mypy]: "
        updates, report_dirs = parse_section(
-            prefix, template, set_strict_flags, section, config_types, stderr
+            prefix, template, set_strict, section, config_types, stderr
        )
        # extend and overwrite existing values with new ones
        _merge_updates(mypy_updates, updates)
@@ -413,7 +422,7 @@ def _parse_and_extend_config_file(
        if name.startswith("mypy-"):
            prefix = get_prefix(file_read, name)
            updates, report_dirs = parse_section(
-                prefix, template, set_strict_flags, section, config_types, stderr
+                prefix, template, set_strict, section, config_types, stderr
            )
            if report_dirs:
                print(
@@ -555,7 +564,7 @@ def destructure_overrides(toml_data: dict[str, Any]) -> dict[str, Any]:
 def parse_section(
    prefix: str,
    template: Options,
-    set_strict_flags: Callable[[], None],
+    set_strict: Callable[[bool], None],
    section: Mapping[str, Any],
    config_types: dict[str, Any],
    stderr: TextIO = sys.stderr,
@@ -644,8 +653,7 @@ def parse_section(
            print(f"{prefix}{key}: {err}", file=stderr)
            continue
        if key == "strict":
-            if v:
-                set_strict_flags()
+            set_strict(v)
            continue
        results[options_key] = v

@@ -746,12 +754,12 @@ def parse_mypy_comments(
        stderr = StringIO()
        strict_found = False

-        def set_strict_flags() -> None:
+        def set_strict(value: bool) -> None:
            nonlocal strict_found
-            strict_found = True
+            strict_found = value

        new_sections, reports = parse_section(
-            "", template, set_strict_flags, parser["dummy"], ini_config_types, stderr=stderr
+            "", template, set_strict, parser["dummy"], ini_config_types, stderr=stderr
        )
        errors.extend((lineno, x) for x in stderr.getvalue().strip().split("\n") if x)
        if reports:

diff --git a/mypy/test/test_config_parser.py b/mypy/test/test_config_parser.py
@@ -209,3 +209,32 @@ def test_extend_cyclic(self) -> None:
                    f"Circular extend detected: {pyproject}\n"
                    f"../pyproject.toml is not a valid path to extend from {ini}\n"
                )
+
+    def test_extend_strict_override(self) -> None:
+        with tempfile.TemporaryDirectory() as _tmpdir:
+            tmpdir = Path(_tmpdir)
+            with chdir(tmpdir):
+                pyproject = tmpdir / "pyproject.toml"
+                write_config(
+                    pyproject, '[tool.mypy]\nextend = "./folder/mypy.ini"\nstrict = True\n'
+                )
+
+                folder = tmpdir / "folder"
+                folder.mkdir()
+                ini = folder / "mypy.ini"
+                write_config(ini, "[mypy]\nstrict = false\n")
+
+                options = Options()
+
+                stdout = io.StringIO()
+                stderr = io.StringIO()
+
+                strict_called = False
+
+                def set_strict_flags() -> None:
+                    nonlocal strict_called
+                    strict_called = True
+
+                parse_config_file(options, set_strict_flags, None, stdout, stderr)
+
+                assert strict_called is False