Renamed two patch functions.

Author: kmvanbrunt

cmd2/argparse_custom.py

@@ -25,7 +25,7 @@
 **Completion**
 
 cmd2 uses its ArgparseCompleter class to enable argparse-based completion
-on all commands that use the @with_argparse wrappers. Out of the box you get
+on all commands that use the @with_argparser decorator. Out of the box you get
 completion of commands, subcommands, and flag names, as well as instructive
 hints about the current argument that print when tab is pressed. In addition,
 you can add completion for each argument's values using parameters passed
@@ -211,15 +211,15 @@ def get_choices(self) -> Choices:
 **Patched argparse functions**
 
 ``argparse._ActionsContainer.add_argument`` - adds arguments related to tab
-completion and enables nargs range parsing. See _add_argument_wrapper for
-more details on these arguments.
+completion and enables nargs range parsing. See ``__ActionsContainer_add_argument``
+for more details on these arguments.
 
 **Added accessor methods**
 
 cmd2 has patched ``argparse.Action`` to include the following accessor methods
 for cases in which you need to manually access the cmd2-specific attributes.
 
-- ``argparse.Action.get_choices_callable()`` - See ``action_get_choices_callable`` for more details.
+- ``argparse.Action.get_choices_callable()`` - See ``_action_get_choices_callable`` for more details.
 - ``argparse.Action.set_choices_provider()`` - See ``_action_set_choices_provider`` for more details.
 - ``argparse.Action.set_completer()`` - See ``_action_set_completer`` for more details.
 - ``argparse.Action.get_table_columns()`` - See ``_action_get_table_columns`` for more details.
@@ -665,15 +665,15 @@ def _action_set_custom_parameter(self: argparse.Action, value: Any) -> None:
 
 
 ############################################################################################################
-# Patch _ActionsContainer.add_argument with our wrapper to support more arguments
+# Patch _ActionsContainer.add_argument to support more arguments
 ############################################################################################################
 
 
-# Save original _ActionsContainer.add_argument so we can call it in our wrapper
+# Save original _ActionsContainer.add_argument so we can call it in our patch
 orig_actions_container_add_argument = argparse._ActionsContainer.add_argument
 
 
-def _add_argument_wrapper(
+def __ActionsContainer_add_argument(  # noqa: N802
     self: argparse._ActionsContainer,
     *args: Any,
     nargs: int | str | tuple[int] | tuple[int, int] | tuple[int, float] | None = None,
@@ -683,7 +683,7 @@ def _add_argument_wrapper(
     table_columns: Sequence[str | Column] | None = None,
     **kwargs: Any,
 ) -> argparse.Action:
-    """Wrap ActionsContainer.add_argument() to support cmd2-specific settings.
+    """Patch ActionsContainer.add_argument() to support cmd2-specific settings.
 
     # Args from original function
     :param self: instance of the _ActionsContainer being added to
@@ -801,8 +801,8 @@ def _add_argument_wrapper(
     return new_arg
 
 
-# Overwrite _ActionsContainer.add_argument with our wrapper
-setattr(argparse._ActionsContainer, 'add_argument', _add_argument_wrapper)
+# Overwrite _ActionsContainer.add_argument with our patch
+setattr(argparse._ActionsContainer, 'add_argument', __ActionsContainer_add_argument)
 
 
 ############################################################################################################

cmd2/cmd2.py

@@ -2716,8 +2716,8 @@ def get_help_topics(self) -> list[str]:
 
     def sigint_handler(
         self,
-        signum: int,  # noqa: ARG002,
-        frame: FrameType | None,  # noqa: ARG002,
+        signum: int,  # noqa: ARG002
+        frame: FrameType | None,  # noqa: ARG002
     ) -> None:
         """Signal handler for SIGINTs which typically come from Ctrl-C events.
 

cmd2/rich_utils.py

@@ -494,12 +494,12 @@ def prepare_objects_for_rendering(*objects: Any) -> tuple[Any, ...]:
 # Text.from_ansi() monkey patch
 ###################################################################################
 
-# Save original Text.from_ansi() so we can call it in our wrapper
+# Save original Text.from_ansi() so we can call it in our patch
 _orig_text_from_ansi = Text.from_ansi
 
 
 @classmethod  # type: ignore[misc]
-def _from_ansi_wrapper(cls: type[Text], text: str, *args: Any, **kwargs: Any) -> Text:  # noqa: ARG001
+def _Text_from_ansi(cls: type[Text], text: str, *args: Any, **kwargs: Any) -> Text:  # noqa: N802, ARG001
     r"""Wrap Text.from_ansi() to fix its trailing newline bug.
 
     This wrapper handles an issue where Text.from_ansi() removes the
@@ -539,4 +539,4 @@ def _from_ansi_has_newline_bug() -> bool:
 
 # Only apply the monkey patch if the bug is present
 if _from_ansi_has_newline_bug():
-    Text.from_ansi = _from_ansi_wrapper  # type: ignore[assignment]
+    Text.from_ansi = _Text_from_ansi  # type: ignore[assignment]

tests/test_rich_utils.py

@@ -115,10 +115,10 @@ def test_set_theme() -> None:
     assert ru.APP_THEME.styles[rich_style_key] == theme[rich_style_key]
 
 
-def test_from_ansi_wrapper() -> None:
+def test_from_ansi_patch() -> None:
     # Check if we are still patching Text.from_ansi(). If this check fails, then Rich
-    # has fixed the bug. Therefore, we can remove this test function and ru._from_ansi_wrapper.
-    assert Text.from_ansi.__func__ is ru._from_ansi_wrapper.__func__  # type: ignore[attr-defined]
+    # has fixed the bug. Therefore, we can remove this test function and ru._Text_from_ansi.
+    assert Text.from_ansi.__func__ is ru._Text_from_ansi.__func__  # type: ignore[attr-defined]
 
     # Line breaks recognized by str.splitlines().
     # Source: https://docs.python.org/3/library/stdtypes.html#str.splitlines