Support module-level strict config flag

mypy/config_parser.py

@@ -153,7 +153,8 @@ def check_follow_imports(choice: str) -> str:
 })
 
 
-def parse_config_file(options: Options, set_strict_flags: Callable[[], None],
+def parse_config_file(options: Options,
+                      strict_flag_assignments: Sequence[Tuple[str, object]],
                       filename: Optional[str],
                       stdout: Optional[TextIO] = None,
                       stderr: Optional[TextIO] = None) -> None:
@@ -205,6 +206,9 @@ def parse_config_file(options: Options, set_strict_flags: Callable[[], None],
     os.environ['MYPY_CONFIG_FILE_DIR'] = os.path.dirname(
             os.path.abspath(config_file))
 
+    def set_strict_flags(updates: Dict[str, object]) -> None:
+        updates.update(strict_flag_assignments)
+
     if 'mypy' not in parser:
         if filename or file_read not in defaults.SHARED_CONFIG_FILES:
             print("%s: No [mypy] section in config file" % file_read, file=stderr)
@@ -217,11 +221,16 @@ def parse_config_file(options: Options, set_strict_flags: Callable[[], None],
             setattr(options, k, v)
         options.report_dirs.update(report_dirs)
 
+    def set_strict_flags_section(updates: Dict[str, object]) -> None:
+        for dest, value in strict_flag_assignments:
+            if dest in PER_MODULE_OPTIONS:
+                updates[dest] = value
+
     for name, section in parser.items():
         if name.startswith('mypy-'):
             prefix = get_prefix(file_read, name)
             updates, report_dirs = parse_section(
-                prefix, options, set_strict_flags, section, config_types, stderr)
+                prefix, options, set_strict_flags_section, section, config_types, stderr)
             if report_dirs:
                 print("%sPer-module sections should not specify reports (%s)" %
                       (prefix, ', '.join(s + '_report' for s in sorted(report_dirs))),
@@ -336,7 +345,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_flags: Callable[[Dict[str, object]], None],
                   section: Mapping[str, Any],
                   config_types: Dict[str, Any],
                   stderr: TextIO = sys.stderr
@@ -416,7 +425,7 @@ def parse_section(prefix: str, template: Options,
             continue
         if key == 'strict':
             if v:
-                set_strict_flags()
+                set_strict_flags(results)
             continue
         if key == 'silent_imports':
             print("%ssilent_imports has been replaced by "
@@ -523,7 +532,7 @@ def parse_mypy_comments(
         stderr = StringIO()
         strict_found = False
 
-        def set_strict_flags() -> None:
+        def set_strict_flags(ignored: Any) -> None:
             nonlocal strict_found
             strict_found = True
 

mypy/main.py

@@ -911,17 +911,14 @@ def add_invertible_flag(flag: str,
 
     options = Options()
 
-    def set_strict_flags() -> None:
-        for dest, value in strict_flag_assignments:
-            setattr(options, dest, value)
-
     # Parse config file first, so command line can override.
-    parse_config_file(options, set_strict_flags, config_file, stdout, stderr)
+    parse_config_file(options, strict_flag_assignments, config_file, stdout, stderr)
 
     # Set strict flags before parsing (if strict mode enabled), so other command
     # line options can override.
     if getattr(dummy, 'special-opts:strict'):  # noqa
-        set_strict_flags()
+        for dest, value in strict_flag_assignments:
+            setattr(options, dest, value)
 
     # Override cache_dir if provided in the environment
     environ_cache_dir = os.getenv('MYPY_CACHE_DIR', '')

mypy/stubtest.py

@@ -1204,11 +1204,21 @@ def test_stubs(args: argparse.Namespace, use_builtins_fixtures: bool = False) ->
     options.custom_typeshed_dir = args.custom_typeshed_dir
     options.config_file = args.mypy_config_file
     options.use_builtins_fixtures = use_builtins_fixtures
+    options.per_module_options = {}
 
     if options.config_file:
-        def set_strict_flags() -> None:  # not needed yet
-            return
-        parse_config_file(options, set_strict_flags, options.config_file, sys.stdout, sys.stderr)
+        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))
 
     try:
         modules = build_stubs(modules, options, find_submodules=not args.check_typeshed)

mypy/test/testfinegrained.py

@@ -160,7 +160,7 @@ def get_options(self,
 
         for name, _ in testcase.files:
             if 'mypy.ini' in name or 'pyproject.toml' in name:
-                parse_config_file(options, lambda: None, name)
+                parse_config_file(options, [], name)
                 break
 
         return options

mypy/test/teststubtest.py

@@ -1047,3 +1047,22 @@ def test_config_file(self) -> None:
         )
         output = run_stubtest(stub=stub, runtime=runtime, options=[], config_file=config_file)
         assert output == ""
+
+    def test_config_file_strict(self) -> None:
+        config_file = (
+            "[mypy]\n"
+            "strict = 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"
+        )
+        config_file = (
+            "[mypy-test_module.*]\n"
+            "strict = True\n"
+        )
+        output = run_stubtest(stub="", runtime="", options=[], config_file=config_file)
+        assert output == (
+            "note: warn_unused_ignores = True [test_module.*]\n"
+        )