[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

mypy/dmypy_server.py

@@ -21,10 +21,10 @@
 from typing import Any, Callable, Final
 from typing_extensions import TypeAlias as _TypeAlias
 
-from mypy import util
 import mypy.build
 import mypy.errors
 import mypy.main
+from mypy import util
 from mypy.dmypy_util import WriteToConn, receive, send
 from mypy.find_sources import InvalidSourceList, create_source_list
 from mypy.fscache import FileSystemCache
@@ -842,9 +842,15 @@ def pretty_messages(
         is_tty: bool = False,
         terminal_width: int | None = None,
     ) -> list[str]:
-        use_color = (True if util.should_force_color()
-                     else self.formatter.default_colored if self.options.color_output == "auto"
-                     else bool(self.options.color_output))
+        use_color = (
+            True
+            if util.should_force_color()
+            else (
+                self.formatter.default_colored
+                if self.options.color_output == "auto"
+                else bool(self.options.color_output)
+            )
+        )
         fit_width = self.options.pretty and is_tty
         if fit_width:
             messages = self.formatter.fit_in_terminal(

mypy/main.py

@@ -124,9 +124,15 @@ def main(
         install_types(formatter, options, non_interactive=options.non_interactive)
         return
 
-    use_color = (True if util.should_force_color()
-                 else formatter.default_colored if options.color_output == "auto"
-                 else bool(options.color_output))
+    use_color = (
+        True
+        if util.should_force_color()
+        else (
+            formatter.default_colored
+            if options.color_output == "auto"
+            else bool(options.color_output)
+        )
+    )
 
     res, messages, blockers = run_build(sources, options, fscache, t0, stdout, stderr, use_color)
 
@@ -137,7 +143,9 @@ def main(
             install_types(formatter, options, after_run=True, non_interactive=True)
             fscache.flush()
             print()
-            res, messages, blockers = run_build(sources, options, fscache, t0, stdout, stderr, use_color)
+            res, messages, blockers = run_build(
+                sources, options, fscache, t0, stdout, stderr, use_color
+            )
         show_messages(messages, stderr, formatter, options, use_color)
 
     if MEM_PROFILE:
@@ -243,8 +251,11 @@ def flush_errors(filename: str | None, new_messages: list[str], serious: bool) -
 
 
 def show_messages(
-    messages: list[str], f: TextIO, formatter: util.FancyFormatter, options: Options,
-    use_color: bool
+    messages: list[str],
+    f: TextIO,
+    formatter: util.FancyFormatter,
+    options: Options,
+    use_color: bool,
 ) -> None:
     for msg in messages:
         if use_color:
@@ -467,10 +478,16 @@ def __call__(
         parser._print_message(formatter.format_help(), self.stdout)
         parser.exit()
 
+
 # Coupled with the usage in define_options
 class ColorOutputAction(argparse.Action):
-    def __call__(self, parser: argparse.ArgumentParser, namespace: argparse.Namespace,
-                 values: str | Sequence[Any] | None, option_string: str | None = None) -> None:
+    def __call__(
+        self,
+        parser: argparse.ArgumentParser,
+        namespace: argparse.Namespace,
+        values: str | Sequence[Any] | None,
+        option_string: str | None = None,
+    ) -> None:
         assert values in ("auto", None)
         print(f"{values=}")
         setattr(namespace, self.dest, True if values is None else "auto")
@@ -1016,16 +1033,13 @@ def add_invertible_flag(
         nargs="?",
         choices=["auto"],
         help="Colorize error messages (inverse: --no-color-output). "
-             "Detects if to use color when option is omitted and --no-color-output "
-             "is not given, or when --color-output=auto",
+        "Detects if to use color when option is omitted and --no-color-output "
+        "is not given, or when --color-output=auto",
     )
     error_group.add_argument(
-        "--no-color-output",
-        dest="color_output",
-        action="store_false",
-        help=argparse.SUPPRESS,
+        "--no-color-output", dest="color_output", action="store_false", help=argparse.SUPPRESS
     )
-    #error_group.set_defaults(color_output="auto")
+    # error_group.set_defaults(color_output="auto")
     add_invertible_flag(
         "--no-error-summary",
         dest="error_summary",

mypy/test/test_color_output.py

@@ -1,24 +1,28 @@
-from subprocess import run, PIPE
 from functools import partial
+from subprocess import PIPE, run
 from typing import Any
+
 import pytest
 
 # TODO Would like help with this test, how do I make it runnable?
 
+
 def test(expect_color: bool, *args: Any, **kwargs: Any) -> None:
-    res = run(*args, stdout=PIPE, stderr=PIPE, **kwargs) #type:ignore[call-overload]
-    if "Found" not in res.stdout: #??
+    res = run(*args, stdout=PIPE, stderr=PIPE, **kwargs)  # type:ignore[call-overload]
+    if "Found" not in res.stdout:  # ??
         pytest.fail("Command failed to complete or did not detect type error")
-    if expect_color: # Expect color control chars
+    if expect_color:  # Expect color control chars
         assert "<string>:1: error:" not in res.stdout
         assert "\nFound" not in res.stdout
-    else: # Expect no color control chars
+    else:  # Expect no color control chars
         assert "<string>:1: error:" in res.stdout
         assert "\nFound" in res.stdout
 
+
 colored = partial(test, True)
 not_colored = partial(test, False)
 
+
 @pytest.mark.parametrize("command", ["mypy", "dmypy run --"])
 def test_color_output(command: str) -> None:
     # Note: Though we don't check stderr, capturing it is useful
@@ -28,7 +32,8 @@ def test_color_output(command: str) -> None:
     colored(f"{command} -c \"1+'a'\"", env={"MYPY_FORCE_COLOR": "1"})
     colored(f"{command} -c \"1+'a'\" --color-output")
     not_colored(f"{command} -c \"1+'a'\" --no-color-output")
-    colored(f"{command} -c \"1+'a'\" --no-color-output", env={"MYPY_FORCE_COLOR": "1"}) #TODO
+    colored(f"{command} -c \"1+'a'\" --no-color-output", env={"MYPY_FORCE_COLOR": "1"})  # TODO
+
 
 # TODO: Tests in the terminal (require manual testing?)
 """
@@ -49,4 +54,4 @@ def test_color_output(command: str) -> None:
 mypy -c "1+'a'" --color-output
 mypy -c "1+'a'" --no-color-output
 set MYPY_FORCE_COLOR=
-"""
+"""

mypy/util.py

@@ -609,15 +609,11 @@ def __init__(
             }
         else:
             if should_force_color():
-                print("warning: failed to detect a suitable terminal color scheme "
-                      "but MYPY_FORCE_COLOR or FORCE_COLOR is set to on")
-            self.colors = {
-                "red": "",
-                "green": "",
-                "blue": "",
-                "yellow": "",
-                "none": "",
-            }
+                print(
+                    "warning: failed to detect a suitable terminal color scheme "
+                    "but MYPY_FORCE_COLOR or FORCE_COLOR is set to on"
+                )
+            self.colors = {"red": "", "green": "", "blue": "", "yellow": "", "none": ""}
 
     def detect_terminal_colors(self, f_out: IO[str], f_err: IO[str]) -> bool:
         if sys.platform not in ("linux", "darwin", "win32", "emscripten"):