Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions jsonargparse/_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def _is_branch_key(parser, key: str) -> bool:


def _find_action_and_subcommand(
parser: Union["ArgumentParser", "ActionsContainer"],
parser: Union[ArgumentParser, ActionsContainer],
dest: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Tuple[Optional[ArgparseAction], Optional[str]]:
Expand Down Expand Up @@ -83,15 +83,15 @@ def _find_action_and_subcommand(


def _find_action(
parser: Union["ArgumentParser", "ActionsContainer"],
parser: Union[ArgumentParser, ActionsContainer],
dest: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Optional[ArgparseAction]:
return _find_action_and_subcommand(parser, dest, exclude=exclude)[0]


def _find_parent_action_and_subcommand(
parser: "ArgumentParser",
parser: ArgumentParser,
key: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Tuple[Optional[ArgparseAction], Optional[str]]:
Expand All @@ -106,7 +106,7 @@ def _find_parent_action_and_subcommand(


def _find_parent_action(
parser: "ArgumentParser",
parser: ArgumentParser,
key: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Optional[ArgparseAction]:
Expand Down Expand Up @@ -516,7 +516,7 @@ class ActionParser:

def __init__(
self,
parser: Optional["ArgumentParser"] = None,
parser: Optional[ArgumentParser] = None,
):
"""Initializer for ActionParser instance.

Expand Down Expand Up @@ -616,7 +616,7 @@ def parent_parsers_context(key, parser):
class _ActionSubCommands(_SubParsersAction):
"""Extension of argparse._SubParsersAction to modify subcommands functionality."""

parent_parser: "ArgumentParser"
parent_parser: ArgumentParser
env_prefix: str

def add_parser(self, name, **kwargs):
Expand Down Expand Up @@ -692,11 +692,11 @@ def not_single_subcommand():

@staticmethod
def get_subcommands(
parser: "ArgumentParser",
parser: ArgumentParser,
cfg: Namespace,
prefix: str = "",
fail_no_subcommand: bool = True,
) -> Tuple[Optional[List[str]], Optional[List["ArgumentParser"]]]:
) -> Tuple[Optional[List[str]], Optional[List[ArgumentParser]]]:
"""Returns subcommand names and corresponding subparsers."""
if parser._subcommands_action is None:
return None, None
Expand Down Expand Up @@ -748,11 +748,11 @@ def get_subcommands(

@staticmethod
def get_subcommand(
parser: "ArgumentParser",
parser: ArgumentParser,
cfg: Namespace,
prefix: str = "",
fail_no_subcommand: bool = True,
) -> Tuple[Optional[str], Optional["ArgumentParser"]]:
) -> Tuple[Optional[str], Optional[ArgumentParser]]:
"""Returns a single subcommand name and corresponding subparser."""
subcommands, subparsers = _ActionSubCommands.get_subcommands(
parser,
Expand All @@ -764,7 +764,7 @@ def get_subcommand(

@staticmethod
def handle_subcommands(
parser: "ArgumentParser",
parser: ArgumentParser,
cfg: Namespace,
env: Optional[bool],
defaults: bool,
Expand Down
2 changes: 1 addition & 1 deletion jsonargparse/_deprecated.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ class DebugException(Exception):
this function.
"""
)
def usage_and_exit_error_handler(parser: "ArgumentParser", message: str) -> None:
def usage_and_exit_error_handler(parser: ArgumentParser, message: str) -> None:
"""Prints the usage and exits with error code 2 (same behavior as argparse).

Args:
Expand Down
6 changes: 3 additions & 3 deletions jsonargparse/_formatters.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def set_comments(cfg, prefix="", depth=0):
def set_yaml_start_comment(
self,
text: str,
cfg: "ruyamlCommentedMap",
cfg: ruyamlCommentedMap,
):
"""Sets the start comment to a ruyaml object.

Expand All @@ -255,7 +255,7 @@ def set_yaml_start_comment(
def set_yaml_group_comment(
self,
text: str,
cfg: "ruyamlCommentedMap",
cfg: ruyamlCommentedMap,
key: str,
depth: int,
):
Expand All @@ -272,7 +272,7 @@ def set_yaml_group_comment(
def set_yaml_argument_comment(
self,
text: str,
cfg: "ruyamlCommentedMap",
cfg: ruyamlCommentedMap,
key: str,
depth: int,
):
Expand Down
8 changes: 4 additions & 4 deletions jsonargparse/_link_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


def find_parent_or_child_actions(
parser: "ArgumentParser",
parser: ArgumentParser,
key: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Optional[List[ArgparseAction]]:
Expand All @@ -44,7 +44,7 @@ def find_parent_or_child_actions(


def find_subclass_action_or_class_group(
parser: "ArgumentParser",
parser: ArgumentParser,
key: str,
exclude: Optional[Union[Type[ArgparseAction], Tuple[Type[ArgparseAction], ...]]] = None,
) -> Optional[Union[ArgparseAction, "ArgumentGroup"]]:
Expand Down Expand Up @@ -271,7 +271,7 @@ def call_compute_fn(self, args):
raise ValueError(f"Call to compute_fn of link '{link}' with args ({args}) failed: {ex}") from ex

@staticmethod
def apply_parsing_links(parser: "ArgumentParser", cfg: Namespace) -> None:
def apply_parsing_links(parser: ArgumentParser, cfg: Namespace) -> None:
if apply_config_skip.get() or _ActionPrintConfig.is_print_config_requested(parser):
return

Expand Down Expand Up @@ -473,7 +473,7 @@ def del_target_key(target_key):
ActionLink.strip_link_target_keys(subparsers[num], cfg[subcommand])


def get_link_actions(parser: "ArgumentParser", apply_on: str, skip=set()) -> List[ActionLink]:
def get_link_actions(parser: ArgumentParser, apply_on: str, skip=set()) -> List[ActionLink]:
if not hasattr(parser, "_links_group"):
return []
return [a for a in parser._links_group._group_actions if a.apply_on == apply_on and a not in skip]
Expand Down
2 changes: 1 addition & 1 deletion jsonargparse/_loaders_dumpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def check_valid_dump_format(dump_format: str):
raise ValueError(f'Unknown output format "{dump_format}".')


def dump_using_format(parser: "ArgumentParser", data: dict, dump_format: str) -> str:
def dump_using_format(parser: ArgumentParser, data: dict, dump_format: str) -> str:
if dump_format == "parser_mode":
dump_format = parser.parser_mode if parser.parser_mode in dumpers else "yaml"
args = (data, parser) if dump_format == "yaml_comments" else (data,)
Expand Down