More code cleanup.

Author: kmvanbrunt

cmd2/cmd2.py

@@ -4170,72 +4170,76 @@ def print_topics(self, header: str, cmds: list[str] | None, cmdlen: int, maxcol:
         :param cmdlen: unused, even by cmd's version
         :param maxcol: max number of display columns to fit into
         """
-        if cmds:
-            header_grid = Table.grid()
-            header_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
-            if self.ruler:
-                header_grid.add_row(Rule(characters=self.ruler))
-            self.poutput(header_grid)
-            self.columnize(cmds, maxcol - 1)
-            self.poutput()
+        if not cmds:
+            return
+
+        header_grid = Table.grid()
+        header_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
+        if self.ruler:
+            header_grid.add_row(Rule(characters=self.ruler))
+        self.poutput(header_grid)
+        self.columnize(cmds, maxcol - 1)
+        self.poutput()
 
     def _print_documented_command_topics(self, header: str, cmds: list[str], verbose: bool) -> None:
         """Print topics which are documented commands, switching between verbose or traditional output."""
         import io
 
-        if cmds:
-            if not verbose:
-                self.print_topics(header, cmds, 15, 80)
-            else:
-                category_grid = Table.grid()
-                category_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
-                category_grid.add_row(Rule(characters=self.ruler))
-                topics_table = Table(
-                    Column("Name", no_wrap=True),
-                    Column("Description", overflow="fold"),
-                    box=SIMPLE_HEAD,
-                    border_style=Cmd2Style.RULE_LINE,
-                    show_edge=False,
-                )
+        if not cmds:
+            return
 
-                # Try to get the documentation string for each command
-                topics = self.get_help_topics()
-                for command in cmds:
-                    if (cmd_func := self.cmd_func(command)) is None:
-                        continue
-
-                    doc: str | None
-
-                    # Non-argparse commands can have help_functions for their documentation
-                    if command in topics:
-                        help_func = getattr(self, constants.HELP_FUNC_PREFIX + command)
-                        result = io.StringIO()
-
-                        # try to redirect system stdout
-                        with contextlib.redirect_stdout(result):
-                            # save our internal stdout
-                            stdout_orig = self.stdout
-                            try:
-                                # redirect our internal stdout
-                                self.stdout = cast(TextIO, result)
-                                help_func()
-                            finally:
-                                with self.sigint_protection:
-                                    # restore internal stdout
-                                    self.stdout = stdout_orig
-                        doc = result.getvalue()
+        if not verbose:
+            self.print_topics(header, cmds, 15, 80)
+        else:
+            category_grid = Table.grid()
+            category_grid.add_row(header, style=Cmd2Style.HELP_HEADER)
+            category_grid.add_row(Rule(characters=self.ruler))
+            topics_table = Table(
+                Column("Name", no_wrap=True),
+                Column("Description", overflow="fold"),
+                box=SIMPLE_HEAD,
+                border_style=Cmd2Style.RULE_LINE,
+                show_edge=False,
+            )
 
-                    else:
-                        doc = cmd_func.__doc__
+            # Try to get the documentation string for each command
+            topics = self.get_help_topics()
+            for command in cmds:
+                if (cmd_func := self.cmd_func(command)) is None:
+                    continue
+
+                doc: str | None
+
+                # Non-argparse commands can have help_functions for their documentation
+                if command in topics:
+                    help_func = getattr(self, constants.HELP_FUNC_PREFIX + command)
+                    result = io.StringIO()
+
+                    # try to redirect system stdout
+                    with contextlib.redirect_stdout(result):
+                        # save our internal stdout
+                        stdout_orig = self.stdout
+                        try:
+                            # redirect our internal stdout
+                            self.stdout = cast(TextIO, result)
+                            help_func()
+                        finally:
+                            with self.sigint_protection:
+                                # restore internal stdout
+                                self.stdout = stdout_orig
+                    doc = result.getvalue()
+
+                else:
+                    doc = cmd_func.__doc__
 
-                    # Attempt to locate the first documentation block
-                    cmd_desc = strip_doc_annotations(doc) if doc else ''
+                # Attempt to locate the first documentation block
+                cmd_desc = strip_doc_annotations(doc) if doc else ''
 
-                    # Add this command to the table
-                    topics_table.add_row(command, cmd_desc)
+                # Add this command to the table
+                topics_table.add_row(command, cmd_desc)
 
-                category_grid.add_row(topics_table)
-                self.poutput(category_grid, "")
+            category_grid.add_row(topics_table)
+            self.poutput(category_grid, "")
 
     def columnize(self, str_list: list[str] | None, display_width: int = 80) -> None:
         """Display a list of single-line strings as a compact set of columns.