More changes

Author: hauntsaninja

mypy/config_parser.py

@@ -284,7 +284,7 @@ def parse_config_file(
 
     os.environ["MYPY_CONFIG_FILE_DIR"] = os.path.dirname(os.path.abspath(config_file))
 
-    def set_strict_flags(updates: Dict[str, object]) -> None:
+    def set_strict_flags(updates: dict[str, object]) -> None:
         updates.update(strict_flag_assignments)
 
     if "mypy" not in parser:
@@ -300,7 +300,7 @@ def set_strict_flags(updates: Dict[str, object]) -> None:
             setattr(options, k, v)
         options.report_dirs.update(report_dirs)
 
-    def set_strict_flags_section(updates: Dict[str, object]) -> None:
+    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
@@ -448,7 +448,7 @@ def destructure_overrides(toml_data: dict[str, Any]) -> dict[str, Any]:
 def parse_section(
     prefix: str,
     template: Options,
-    set_strict_flags: Callable[[Dict[str, object]], None],
+    set_strict_flags: Callable[[dict[str, object]], None],
     section: Mapping[str, Any],
     config_types: dict[str, Any],
     stderr: TextIO = sys.stderr,

mypy/main.py

@@ -1265,7 +1265,6 @@ def add_invertible_flag(
         parser.error(f"Cannot find config file '{config_file}'")
 
     options = Options()
-    strict_option_set = False
 
     # Parse config file first, so command line can override.
     parse_config_file(options, strict_flag_assignments, config_file, stdout, stderr)
@@ -1395,9 +1394,6 @@ def add_invertible_flag(
             " new type inference algorithm is already enabled by default"
         )
 
-    if options.strict_concatenate and not strict_option_set:
-        print("Warning: --strict-concatenate is deprecated; use --extra-checks instead")
-
     # Set target.
     if special_opts.modules + special_opts.packages:
         options.build_type = BuildType.MODULE

mypy/options.py

@@ -212,7 +212,7 @@ def __init__(self) -> None:
         # This makes 1 == '1', 1 in ['1'], and 1 is '1' errors.
         self.strict_equality = False
 
-        # Deprecated, use extra_checks instead.
+        # Make arguments prepended via Concatenate be truly positional-only.
         self.strict_concatenate = False
 
         # Enable additional checks that are technically correct but impractical.

mypy/test/teststubtest.py

@@ -2650,7 +2650,11 @@ def test_config_file_strict(self) -> None:
         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")
+        assert output == (
+            "note: warn_unused_ignores = True [test_module.*]\n"
+            "Success: no issues found in 1 module\n"
+        )