Support module-level strict config flag

mypy/config_parser.py

@@ -1,5 +1,6 @@
 import argparse
 import configparser
+from functools import partial
 import glob as fileglob
 from io import StringIO
 import os
@@ -153,7 +154,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,
+                      set_strict_flags: Callable[[bool, Dict[str, object]], None],
                       filename: Optional[str],
                       stdout: Optional[TextIO] = None,
                       stderr: Optional[TextIO] = None) -> None:
@@ -205,14 +207,17 @@ 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))
 
+    set_strict_flags_toplevel = partial(set_strict_flags, True)
+    set_strict_flags_module = partial(set_strict_flags, False)
+
     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)
     else:
         section = parser['mypy']
         prefix = '%s: [%s]: ' % (file_read, 'mypy')
         updates, report_dirs = parse_section(
-            prefix, options, set_strict_flags, section, config_types, stderr)
+            prefix, options, set_strict_flags_toplevel, section, config_types, stderr)
         for k, v in updates.items():
             setattr(options, k, v)
         options.report_dirs.update(report_dirs)
@@ -221,7 +226,7 @@ def parse_config_file(options: Options, set_strict_flags: Callable[[], None],
         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_module, 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 +341,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 +421,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 +528,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

@@ -22,7 +22,7 @@
 from mypy.fscache import FileSystemCache
 from mypy.errors import CompileError
 from mypy.errorcodes import error_codes
-from mypy.options import Options, BuildType
+from mypy.options import Options, BuildType, PER_MODULE_OPTIONS
 from mypy.config_parser import get_config_module_names, parse_version, parse_config_file
 from mypy.split_namespace import SplitNamespace
 
@@ -911,17 +911,19 @@ def add_invertible_flag(flag: str,
 
     options = Options()
 
-    def set_strict_flags() -> None:
+    def set_strict_flags(toplevel: bool, results: Dict[str, object]) -> None:
         for dest, value in strict_flag_assignments:
-            setattr(options, dest, value)
+            if toplevel or dest in PER_MODULE_OPTIONS:
+                results[dest] = value
 
     # Parse config file first, so command line can override.
     parse_config_file(options, set_strict_flags, 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

@@ -1207,8 +1207,8 @@ def test_stubs(args: argparse.Namespace, use_builtins_fixtures: bool = False) ->
     options.use_builtins_fixtures = use_builtins_fixtures
 
     if options.config_file:
-        def set_strict_flags() -> None:  # not needed yet
-            return
+        def set_strict_flags(toplevel: bool, results: Dict[str, object]) -> None:  # not needed yet
+            print("note: set_strict_flags called with toplevel={}".format(toplevel))
         parse_config_file(options, set_strict_flags, options.config_file, sys.stdout, sys.stderr)
 
     try:

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, lambda t, r: None, name)
                 break
 
         return options

mypy/test/teststubtest.py

@@ -1047,3 +1047,17 @@ 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: set_strict_flags called with toplevel=True\n"
+        config_file = (
+            "[mypy-submodule.*]\n"
+            "strict = True\n"
+        )
+        output = run_stubtest(stub="", runtime="", options=[], config_file=config_file)
+        assert output == "note: set_strict_flags called with toplevel=False\n"