Other solution

Author: sbrunner

prospector/run.py

@@ -86,11 +86,11 @@ def execute(self) -> None:
 
             running_tools[toolname] = tool
 
-            try:
-                # Tools can output to stdout/stderr in unexpected places, for example,
-                # pydocstyle emits warnings about __all__ and as pyroma exec's the setup.py
-                # file, it will execute any print statements in that, etc etc...
-                with CaptureOutput(hide=not self.config.direct_tool_stdout) as capture:
+            # Tools can output to stdout/stderr in unexpected places, for example,
+            # pydocstyle emits warnings about __all__ and as pyroma exec's the setup.py
+            # file, it will execute any print statements in that, etc etc...
+            with CaptureOutput(hide=not self.config.direct_tool_stdout) as capture:
+                try:
                     messages += tool.run(found_files)
 
                     if self.config.include_tool_stdout:
@@ -103,25 +103,33 @@ def execute(self) -> None:
                             msg = f"stdout from {toolname}:\n{capture.get_hidden_stdout()}"
                             messages.append(Message(toolname, "hidden-output", loc, message=msg))
 
-            except FatalProspectorException as fatal:
-                sys.stderr.write(f"FatalProspectorException: {str(fatal)}")
-                sys.exit(2)
-
-            except (SystemExit, Exception) as ex:  # pylint:disable=broad-except
-                if self.config.die_on_tool_error:
-                    raise FatalProspectorException(f"Tool {toolname} failed to run.") from ex
-                loc = Location(self.config.workdir, None, None, None, None)
-                msg = (
-                    f"Tool {toolname} failed to run "
-                    f"(exception was raised, re-run prospector with -X to see the stacktrace)"
-                )
-                message = Message(
-                    toolname,
-                    "failure",
-                    loc,
-                    message=msg,
-                )
-                messages.append(message)
+                except FatalProspectorException as fatal:
+                    sys.stderr.write(f"FatalProspectorException: {str(fatal)}")
+                    sys.exit(2)
+
+                except (SystemExit, Exception) as ex:  # pylint:disable=broad-except
+                    stderr = capture.get_hidden_stderr().strip()
+                    if self.config.die_on_tool_error:
+                        msg = f"Tool {toolname} failed to run"
+                        if stderr:
+                            msg += ", with stderr:\n" + stderr
+                        else:
+                            msg += "."
+                        raise FatalProspectorException() from ex
+                    loc = Location(self.config.workdir, None, None, None, None)
+
+                    msg = f"Tool {toolname} failed to run "
+                    if stderr:
+                        msg += f", with stderr:\n{stderr}\n"
+                    msg += "(exception was raised, re-run prospector with -X to see the stacktrace)\n"
+
+                    message = Message(
+                        toolname,
+                        "failure",
+                        loc,
+                        message=msg,
+                    )
+                    messages.append(message)
 
         messages = self.process_messages(found_files, messages, running_tools)
 

prospector/tools/mypy/__init__.py

@@ -126,25 +126,7 @@ def run(self, found_files: FileFinder) -> list[Message]:
 
     def _run_std(self, args: list[str]) -> list[Message]:
         messages = []
-        try:
-            sources, options = mypy.main.process_options(args, fscache=self.fscache)
-        except (SystemExit, Exception) as e:
-            message = "The error(s) will be displayed before the messages" if isinstance(e, SystemExit) else str(e)
-            messages.append(
-                Message(
-                    "mypy",
-                    code="fatal-options-error",
-                    message=message,
-                    location=Location(
-                        path="",
-                        module=None,
-                        function=None,
-                        line=0,
-                        character=0,
-                    ),
-                )
-            )
-            return messages
+        sources, options = mypy.main.process_options(args, fscache=self.fscache)
         options.output = "json"
         try:
             res = mypy.build.build(sources, options, fscache=self.fscache)