Moved some imports.

Fixed circular import between utils.py and completion.py.

Author: kmvanbrunt

cmd2/cmd2.py

@@ -62,6 +62,7 @@
     TYPE_CHECKING,
     Any,
     TextIO,
+    TypeAlias,
     TypeVar,
     Union,
     cast,
@@ -198,6 +199,13 @@ def __init__(self, msg: str = '') -> None:
     suggest_similar,
 )
 
+if TYPE_CHECKING:  # pragma: no cover
+    StaticArgParseBuilder = staticmethod[[], argparse.ArgumentParser]
+    ClassArgParseBuilder = classmethod['Cmd' | CommandSet, [], argparse.ArgumentParser]
+else:
+    StaticArgParseBuilder = staticmethod
+    ClassArgParseBuilder = classmethod
+
 
 class _SavedCmd2Env:
     """cmd2 environment settings that are backed up when entering an interactive Python shell."""
@@ -211,14 +219,6 @@ def __init__(self) -> None:
 DisabledCommand = namedtuple('DisabledCommand', ['command_function', 'help_function', 'completer_function'])  # noqa: PYI024
 
 
-if TYPE_CHECKING:  # pragma: no cover
-    StaticArgParseBuilder = staticmethod[[], argparse.ArgumentParser]
-    ClassArgParseBuilder = classmethod['Cmd' | CommandSet, [], argparse.ArgumentParser]
-else:
-    StaticArgParseBuilder = staticmethod
-    ClassArgParseBuilder = classmethod
-
-
 class _CommandParsers:
     """Create and store all command method argument parsers for a given Cmd instance.
 
@@ -2195,8 +2195,8 @@ def _determine_ap_completer_type(parser: argparse.ArgumentParser) -> type[argpar
         :param parser: the parser to examine
         :return: type of ArgparseCompleter
         """
-        Completer = type[argparse_completer.ArgparseCompleter] | None  # noqa: N806
-        completer_type: Completer = parser.get_ap_completer_type()  # type: ignore[attr-defined]
+        APCompleterType: TypeAlias = type[argparse_completer.ArgparseCompleter] | None
+        completer_type: APCompleterType = parser.get_ap_completer_type()  # type: ignore[attr-defined]
 
         if completer_type is None:
             completer_type = argparse_completer.DEFAULT_AP_COMPLETER

cmd2/completion.py

@@ -28,7 +28,6 @@
 from rich.protocol import is_renderable
 
 from . import rich_utils as ru
-from . import utils
 
 # Regular expression to identify strings which we should sort numerically
 NUMERIC_RE = re.compile(
@@ -143,6 +142,8 @@ class CompletionResultsBase:
 
     def __post_init__(self) -> None:
         """Finalize the object after initialization."""
+        from . import utils
+
         unique_items = utils.remove_duplicates(self.items)
         if not self.is_sorted:
             if all_display_numeric(unique_items):

cmd2/utils.py

@@ -28,7 +28,6 @@
 
 from . import constants
 from . import string_utils as su
-from .completion import Choices
 from .types import (
     ChoicesProviderUnbound,
     CmdOrSet,
@@ -114,6 +113,7 @@ def __init__(
         :param completer: completion function that provides choices for this argument
         """
         if val_type is bool:
+            from .completion import Choices
 
             def get_bool_choices(_cmd2_self: CmdOrSet) -> Choices:
                 """Tab complete lowercase boolean values."""