Fix one issue and simplify another thing

Author: tleonhardt

cmd2/argparse_custom.py

@@ -1261,7 +1261,7 @@ def _format_action_invocation(self, action: argparse.Action) -> str:
     def _determine_metavar(
         self,
         action: argparse.Action,
-        default_metavar: str,
+        default_metavar: str | tuple[str, ...],
     ) -> str | tuple[str, ...]:
         """Determine what to use as the metavar value of an action."""
         if action.metavar is not None:
@@ -1278,7 +1278,7 @@ def _determine_metavar(
     def _metavar_formatter(
         self,
         action: argparse.Action,
-        default_metavar: str,
+        default_metavar: str | tuple[str, ...],
     ) -> Callable[[int], tuple[str, ...]]:
         metavar = self._determine_metavar(action, default_metavar)
 
@@ -1289,7 +1289,7 @@ def format_tuple(tuple_size: int) -> tuple[str, ...]:
 
         return format_tuple
 
-    def _format_args(self, action: argparse.Action, default_metavar: str) -> str:
+    def _format_args(self, action: argparse.Action, default_metavar: str | tuple[str, ...]) -> str:
         """Handle ranged nargs and make other output less verbose."""
         metavar = self._determine_metavar(action, default_metavar)
         metavar_formatter = self._metavar_formatter(action, default_metavar)
@@ -1311,7 +1311,7 @@ def _format_args(self, action: argparse.Action, default_metavar: str) -> str:
             if isinstance(action.nargs, int) and action.nargs > 1:
                 return '{}{{{}}}'.format('%s' % metavar_formatter(1), action.nargs)  # noqa: UP031
 
-        return super()._format_args(action, default_metavar)
+        return super()._format_args(action, default_metavar)  # type: ignore[arg-type]
 
 
 class RawDescriptionCmd2HelpFormatter(

cmd2/rl_utils.py

@@ -297,17 +297,5 @@ def rl_in_search_mode() -> bool:  # pragma: no cover
 
 
 __all__ = [
-    'RlType',
     'readline',
-    'rl_escape_prompt',
-    'rl_force_redisplay',
-    'rl_get_display_prompt',
-    'rl_get_point',
-    'rl_get_prompt',
-    'rl_in_search_mode',
-    'rl_set_prompt',
-    'rl_type',
-    'rl_unescape_prompt',
-    'rl_warning',
-    'vt100_support',
 ]