More changes

Author: hauntsaninja

mypy/config_parser.py

@@ -639,7 +639,7 @@ def parse_mypy_comments(
         stderr = StringIO()
         strict_found = False
 
-        def set_strict_flags(ignored: Any) -> None:
+        def set_strict_flags(updates: dict[str, object]) -> None:
             nonlocal strict_found
             strict_found = True
 

mypy/stubtest.py

@@ -1945,19 +1945,7 @@ def test_stubs(args: _Arguments, use_builtins_fixtures: bool = False) -> int:
     options.pdb = args.pdb
 
     if options.config_file:
-        strict_flags = ["warn_unused_configs", "warn_unused_ignores"]
-
-        strict_flag_assignments = [(dest, True) for dest in strict_flags]
-        parse_config_file(
-            options, strict_flag_assignments, options.config_file, sys.stdout, sys.stderr
-        )
-
-        for dest in strict_flags:
-            if getattr(options, dest, False):
-                print("note: {} = True [global]".format(dest))
-            for glob, updates in options.per_module_options.items():
-                if updates.get(dest):
-                    print("note: {} = True [{}]".format(dest, glob))
+        parse_config_file(options, [], options.config_file, sys.stdout, sys.stderr)
 
     def error_callback(msg: str) -> typing.NoReturn:
         print(_style("error:", color="red", bold=True), msg)

mypy/test/teststubtest.py

@@ -2643,18 +2643,3 @@ def test_module_and_typeshed(self) -> None:
         assert remove_color_code(output.getvalue()) == (
             "error: cannot pass both --check-typeshed and a list of modules\n"
         )
-
-    def test_config_file_strict(self) -> None:
-        config_file = "[mypy]\nstrict = True\n"
-        output = run_stubtest(stub="", runtime="", options=[], config_file=config_file)
-        assert output == (
-            "note: warn_unused_configs = True [global]\n"
-            "note: warn_unused_ignores = True [global]\n"
-            "Success: no issues found in 1 module\n"
-        )
-        config_file = "[mypy-test_module.*]\nstrict = True\n"
-        output = run_stubtest(stub="", runtime="", options=[], config_file=config_file)
-        assert output == (
-            "note: warn_unused_ignores = True [test_module.*]\n"
-            "Success: no issues found in 1 module\n"
-        )

test-data/unit/check-flags.test

@@ -2125,6 +2125,31 @@ disallow_subclassing_any = true
 module = 'm'
 disallow_subclassing_any = false
 
+[case testStrictPerModule]
+# flags: --config-file tmp/mypy.ini
+
+import strictmodule
+import loosemodule
+a = 0  # type: ignore
+
+[file strictmodule.py]
+a = 0  # type: ignore  # E: Unused "type: ignore" comment
+
+def foo():  # E: Function is missing a return type annotation \
+            # N: Use "-> None" if function does not return a value
+    1 + "asdf"  # E: Unsupported operand types for + ("int" and "str")
+
+[file loosemodule.py]
+a = 0  # type: ignore
+
+def foo():
+    1 + "asdf"
+
+[file mypy.ini]
+[mypy]
+strict = False
+[mypy-strictmodule]
+strict = True
 
 [case testNoImplicitOptionalPerModule]
 # flags: --config-file tmp/mypy.ini