@@ -408,11 +408,7 @@ def update_mutex_groups(arg_action: argparse.Action) -> None:
408408 parent_tokens [action .dest ] = [token ]
409409
410410 parser : argparse .ArgumentParser = self ._subcommand_action .choices [token ]
411- completer_type : Optional [
412- Type [ArgparseCompleter ]
413- ] = parser .get_ap_completer_type () # type: ignore[attr-defined]
414- if completer_type is None :
415- completer_type = DEFAULT_AP_COMPLETER
411+ completer_type = self ._cmd2_app ._determine_ap_completer_type (parser )
416412
417413 completer = completer_type (parser , self ._cmd2_app , parent_tokens = parent_tokens )
418414
@@ -616,11 +612,7 @@ def complete_subcommand_help(self, text: str, line: str, begidx: int, endidx: in
616612 for token_index , token in enumerate (tokens ):
617613 if token in self ._subcommand_action .choices :
618614 parser : argparse .ArgumentParser = self ._subcommand_action .choices [token ]
619- completer_type : Optional [
620- Type [ArgparseCompleter ]
621- ] = parser .get_ap_completer_type () # type: ignore[attr-defined]
622- if completer_type is None :
623- completer_type = DEFAULT_AP_COMPLETER
615+ completer_type = self ._cmd2_app ._determine_ap_completer_type (parser )
624616
625617 completer = completer_type (parser , self ._cmd2_app )
626618 return completer .complete_subcommand_help (text , line , begidx , endidx , tokens [token_index + 1 :])
@@ -643,11 +635,7 @@ def format_help(self, tokens: List[str]) -> str:
643635 for token_index , token in enumerate (tokens ):
644636 if token in self ._subcommand_action .choices :
645637 parser : argparse .ArgumentParser = self ._subcommand_action .choices [token ]
646- completer_type : Optional [
647- Type [ArgparseCompleter ]
648- ] = parser .get_ap_completer_type () # type: ignore[attr-defined]
649- if completer_type is None :
650- completer_type = DEFAULT_AP_COMPLETER
638+ completer_type = self ._cmd2_app ._determine_ap_completer_type (parser )
651639
652640 completer = completer_type (parser , self ._cmd2_app )
653641 return completer .format_help (tokens [token_index + 1 :])
0 commit comments