Cleanup temporary --overwrite-union-syntax flag

Author: cdce8p

mypy/main.py

@@ -823,10 +823,6 @@ def add_invertible_flag(
     add_invertible_flag(
         "--force-union-syntax", default=False, help=argparse.SUPPRESS, group=none_group
     )
-    # For internal use only! Will be removed once Mypy drops support for Python 3.9.
-    add_invertible_flag(
-        "--overwrite-union-syntax", default=False, help=argparse.SUPPRESS, group=none_group
-    )
 
     lint_group = parser.add_argument_group(
         title="Configuring warnings",

mypy/options.py

@@ -413,8 +413,6 @@ def __init__(self) -> None:
         # Deprecated, Mypy only supports Python 3.9+
         self.force_uppercase_builtins = False
         self.force_union_syntax = False
-        # Mypy internal use only! Set during test run.
-        self.overwrite_union_syntax = False
 
         # Sets custom output format
         self.output: str | None = None

mypy/test/helpers.py

@@ -357,7 +357,6 @@ def parse_options(
         options = Options()
         options.error_summary = False
         options.hide_error_codes = True
-        options.overwrite_union_syntax = True
 
     # Allow custom python version to override testfile_pyversion.
     if all(flag.split("=")[0] != "--python-version" for flag in flag_list):

mypy/test/testcheck.py

@@ -136,7 +136,6 @@ def run_case_once(
         options = parse_options(original_program_text, testcase, incremental_step)
         options.use_builtins_fixtures = True
         options.show_traceback = True
-        options.overwrite_union_syntax = True
 
         if options.num_workers:
             options.fixed_format_cache = True

mypy/test/testcmdline.py

@@ -60,7 +60,6 @@ def test_python_cmdline(testcase: DataDrivenTestCase, step: int) -> None:
     args = parse_args(testcase.input[0])
     custom_cwd = parse_cwd(testcase.input[1]) if len(testcase.input) > 1 else None
     args.append("--show-traceback")
-    args.append("--overwrite-union-syntax")
     if "--error-summary" not in args:
         args.append("--no-error-summary")
     if "--show-error-codes" not in args:

mypy/test/testfinegrained.py

@@ -152,7 +152,6 @@ def get_options(self, source: str, testcase: DataDrivenTestCase, build_cache: bo
         options.use_fine_grained_cache = self.use_cache and not build_cache
         options.cache_fine_grained = self.use_cache
         options.local_partial_types = True
-        options.overwrite_union_syntax = True
         options.export_types = "inspect" in testcase.file
         # Treat empty bodies safely for these test cases.
         options.allow_empty_bodies = not testcase.name.endswith("_no_empty")

mypy/test/testmerge.py

@@ -102,7 +102,6 @@ def build(self, source: str, testcase: DataDrivenTestCase) -> BuildResult | None
         options.export_types = True
         options.show_traceback = True
         options.allow_empty_bodies = True
-        options.overwrite_union_syntax = True
         main_path = os.path.join(test_temp_dir, "main")
 
         self.str_conv.options = options

mypy/test/testparse.py

@@ -38,7 +38,6 @@ def test_parser(testcase: DataDrivenTestCase) -> None:
     The argument contains the description of the test case.
     """
     options = Options()
-    options.overwrite_union_syntax = True
     options.hide_error_codes = True
 
     if testcase.file.endswith("python310.test"):

mypy/test/testpythoneval.py

@@ -52,7 +52,6 @@ def test_python_evaluation(testcase: DataDrivenTestCase, cache_dir: str) -> None
         "--no-error-summary",
         "--hide-error-codes",
         "--allow-empty-bodies",
-        "--overwrite-union-syntax",
         "--test-env",  # Speeds up some checks
     ]
     interpreter = python3_path

mypy/test/testsemanal.py

@@ -38,7 +38,6 @@ def get_semanal_options(program_text: str, testcase: DataDrivenTestCase) -> Opti
     options.semantic_analysis_only = True
     options.show_traceback = True
     options.python_version = PYTHON3_VERSION
-    options.overwrite_union_syntax = True
     return options