Foldd back _complete_render_option into it's public counterpart

Author: Carreau

pyinstrument/__main__.py

@@ -9,7 +9,7 @@
 import shutil
 import sys
 import time
-from typing import Any, List, Optional, TextIO, Tuple, cast
+from typing import Any, List, TextIO, cast
 
 import pyinstrument
 from pyinstrument import Profiler, renderers
@@ -410,7 +410,10 @@ def store_and_consume_remaining(
 
 
 def compute_render_options(
-    options: CommandLineOptions, renderer_class: type[renderers.Renderer], output_file: TextIO
+    options: CommandLineOptions,
+    renderer_class: type[renderers.Renderer],
+    unicode_support: bool,
+    color_support: bool,
 ) -> dict[str, Any]:
     """
     Given a list of CommandLineOptions, compute the
@@ -420,33 +423,9 @@ def compute_render_options(
 
     """
 
-    unicode_support: bool = file_supports_unicode(output_file)
-    color_support: bool = file_supports_color(output_file)
-
-    error, render_options = _compute_render_options(
-        options, renderer_class, unicode_support, color_support
-    )
-    if error is not None:
-        raise OptionsParseError(error)
-    assert render_options is not None
-    return render_options
-
-
-def _compute_render_options(
-    options: CommandLineOptions,
-    renderer_class: type[renderers.Renderer],
-    unicode_support: bool,
-    color_support: bool,
-) -> Tuple[Optional[str], Optional[dict[str, Any]]]:
-    """
-    Similar as compute_render_options, but return a tuple (error message, data)
-    if there is an error; this will let us reuse _compute_render_options in magics.
-
-    output_file, has been replaced by unicode_support:bool, color_support:bool
-    """
     # parse show/hide options
     if options.hide_fnmatch is not None and options.hide_regex is not None:
-        return ("You can‘t specify both --hide and --hide-regex", None)
+        raise OptionsParseError("You can‘t specify both --hide and --hide-regex")
 
     hide_regex: str | None
     show_regex: str | None
@@ -461,7 +440,7 @@ def _compute_render_options(
         options.show_all,
     ]
     if show_options_used.count(True) > 1:
-        return ("You can only specify one of --show, --show-regex and --show-all", None)
+        raise OptionsParseError("You can only specify one of --show, --show-regex and --show-all")
 
     if options.show_fnmatch is not None:
         show_regex = fnmatch.translate(options.show_fnmatch)
@@ -510,7 +489,7 @@ def _compute_render_options(
 
                 keypath.set_value_at_keypath(render_options, key, parsed_value)
 
-    return None, render_options
+    return render_options
 
 
 class OptionsParseError(Exception):
@@ -521,7 +500,10 @@ def create_renderer(
     renderer_class: type[renderers.Renderer], options: CommandLineOptions, output_file: TextIO
 ) -> renderers.Renderer:
     render_options = compute_render_options(
-        options, renderer_class=renderer_class, output_file=output_file
+        options,
+        renderer_class=renderer_class,
+        unicode_support=file_supports_unicode(output_file),
+        color_support=file_supports_color(output_file),
     )
 
     try:

pyinstrument/magic/magic.py

@@ -14,7 +14,7 @@
 from IPython.display import IFrame, display
 
 from pyinstrument import Profiler, renderers
-from pyinstrument.__main__ import _compute_render_options
+from pyinstrument.__main__ import compute_render_options
 from pyinstrument.frame import Frame
 from pyinstrument.frame_ops import delete_frame_from_tree
 from pyinstrument.processors import ProcessorOptions
@@ -241,17 +241,13 @@ def pyinstrument(self, line, cell=None):
             )
             return
 
-        html_error, html_config = _compute_render_options(
+        html_config = compute_render_options(
             args, renderer_class=HTMLRenderer, unicode_support=True, color_support=True
         )
-        if html_error is not None:
-            raise ValueError(html_error)
 
-        text_error, text_config = _compute_render_options(
+        text_config = compute_render_options(
             args, renderer_class=HTMLRenderer, unicode_support=True, color_support=True
         )
-        if text_error is not None:
-            raise ValueError(text_error)
 
         html_renderer = renderers.HTMLRenderer(show_all=args.show_all, timeline=args.timeline)
         html_renderer.preprocessors.append(strip_ipython_frames_processor)