reorg imports

Author: ThomasWaldmann

src/borg/archiver/completion_cmd.py

@@ -52,9 +52,6 @@
 
 import shtab
 
-from jsonargparse._actions import _ActionSubCommands
-from jsonargparse._completions import prepare_actions_context, shtab_prepare_actions, bash_compgen_typehint
-
 from ._common import process_epilog
 from ..constants import *  # NOQA
 from ..helpers import (
@@ -69,6 +66,8 @@
     parse_file_size,
 )
 from ..helpers.argparsing import ArgumentParser, RawDescriptionHelpFormatter
+from ..helpers.argparsing import _ActionSubCommands
+from ..helpers.argparsing import prepare_actions_context, shtab_prepare_actions, bash_compgen_typehint
 from ..helpers.time import timestamp
 from ..helpers.parseformat import partial_format
 from ..manifest import AI_HUMAN_SORT_KEYS

src/borg/helpers/argparsing.py

@@ -4,6 +4,9 @@
 # all other imports of these names import them from here:
 from argparse import Action, ArgumentError, ArgumentTypeError, RawDescriptionHelpFormatter  # noqa: F401
 from jsonargparse import ArgumentParser, Namespace, SUPPRESS, REMAINDER  # noqa: F401
+# borg completion uses these private symbols, so we need to import them:
+from jsonargparse._actions import _ActionSubCommands  # noqa: F401
+from jsonargparse._completions import prepare_actions_context, shtab_prepare_actions, bash_compgen_typehint  # noqa: F401
 
 
 def flatten_namespace(ns: Any) -> Namespace: