upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-03-23 10:57:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

import ActionSubCommands from jsonargparse

Browse source
This commit is contained in:
Thomas Waldmann 2026-03-04 08:39:07 +01:00
parent 4a6b4130ef
commit e15547a685
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/borg/archiver/completion_cmd.py
View file

@ -66,7 +66,7 @@ from ..helpers import (
parse_file_size,
)
from ..helpers.argparsing import ArgumentParser
from ..helpers.argparsing import _ActionSubCommands
from ..helpers.argparsing import ActionSubCommands
from ..helpers.time import timestamp
from ..helpers.parseformat import partial_format
from ..manifest import AI_HUMAN_SORT_KEYS
@ -631,7 +631,7 @@ def _attach_completion(parser: ArgumentParser, type_class, completion_dict: dict
"""Tag all arguments with type `type_class` with completion choices from `completion_dict`."""
for action in parser._actions:
if isinstance(action, _ActionSubCommands):
if isinstance(action, ActionSubCommands):
for sub in action.choices.values():
_attach_completion(sub, type_class, completion_dict)
continue
@ -643,7 +643,7 @@ def _attach_completion(parser: ArgumentParser, type_class, completion_dict: dict
def _attach_help_completion(parser: ArgumentParser, completion_dict: dict):
"""Tag the 'topic' argument of the 'help' command with static completion choices."""
for action in parser._actions:
if isinstance(action, _ActionSubCommands):
if isinstance(action, ActionSubCommands):
for sub in action.choices.values():
_attach_help_completion(sub, completion_dict)
continue
@ -690,7 +690,7 @@ class CompletionMixIn:
# Collect all commands and help topics for "borg help" completion
help_choices = list(self.helptext.keys())
for action in parser._actions:
if isinstance(action, _ActionSubCommands):
if isinstance(action, ActionSubCommands):
help_choices.extend(action.choices.keys())
help_completion_fn = "_borg_help_topics"

8
src/borg/helpers/argparsing.py
View file

@ -100,12 +100,8 @@ from typing import Any
# all other imports of these names import them from here:
from argparse import Action, ArgumentError, ArgumentTypeError, RawDescriptionHelpFormatter # noqa: F401
from jsonargparse import ArgumentParser as _ArgumentParser # we subclass that to add custom behavior
from jsonargparse import Namespace, SUPPRESS, REMAINDER # noqa: F401
from jsonargparse.typing import register_type # noqa: F401
from jsonargparse.typing import PositiveInt # noqa: F401
# borg completion uses these private symbols, so we need to import them:
from jsonargparse._actions import _ActionSubCommands # noqa: F401
from jsonargparse import Namespace, ActionSubCommands, SUPPRESS, REMAINDER # noqa: F401
from jsonargparse.typing import register_type, PositiveInt # noqa: F401
class ArgumentParser(_ArgumentParser):