mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-23 16:26:29 +00:00
Code Issues Releases Wiki Activity

arg parsing: fix fallback function, refactor, fixes #3205

Browse source 
This is a fixup for #3155, which was broken on at least python <= 3.4.2.

Also clarify when to use which *func in set_defaults.

(cherry picked from commit 5ce4fa9704)
This commit is contained in:
Thomas Waldmann 2017-10-22 17:34:02 +02:00
parent 152bb27663
commit ae91aff681
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/borg/archiver.py
View file

@ -169,6 +169,18 @@ def parse_storage_quota(storage_quota):
return parsed return parsed
def get_func(args):
# This works around http://bugs.python.org/issue9351
# func is used at the leaf parsers of the argparse parser tree,
# fallback_func at next level towards the root,
# fallback2_func at the 2nd next level (which is root in our case).
for name in 'func', 'fallback_func', 'fallback2_func':
func = getattr(args, name, None)
if func is not None:
return func
raise Exception('expected func attributes not found')
class Archiver: class Archiver:
def __init__(self, lock_wait=None, prog=None): def __init__(self, lock_wait=None, prog=None):
@ -2233,7 +2245,7 @@ def define_archive_filters_group(subparser, *, sort_by=True, first_last=True):
parser = argparse.ArgumentParser(prog=self.prog, description='Borg - Deduplicated Backups', parser = argparse.ArgumentParser(prog=self.prog, description='Borg - Deduplicated Backups',
add_help=False) add_help=False)
parser.set_defaults(func=functools.partial(self.do_maincommand_help, parser)) parser.set_defaults(fallback2_func=functools.partial(self.do_maincommand_help, parser))
parser.common_options = self.CommonOptions(define_common_options, parser.common_options = self.CommonOptions(define_common_options,
suffix_precedence=('_maincommand', '_midcommand', '_subcommand')) suffix_precedence=('_maincommand', '_midcommand', '_subcommand'))
parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + __version__, parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + __version__,
@ -3688,8 +3700,7 @@ def parse_args(self, args=None):
parser = self.build_parser() parser = self.build_parser()
args = parser.parse_args(args or ['-h']) args = parser.parse_args(args or ['-h'])
parser.common_options.resolve(args) parser.common_options.resolve(args)
# This works around http://bugs.python.org/issue9351 func = get_func(args)
func = getattr(args, 'func', None) or getattr(args, 'fallback_func')
if func == self.do_create and not args.paths: if func == self.do_create and not args.paths:
# need at least 1 path but args.paths may also be populated from patterns # need at least 1 path but args.paths may also be populated from patterns
parser.error('Need at least one PATH argument.') parser.error('Need at least one PATH argument.')
@ -3725,8 +3736,7 @@ def _setup_topic_debugging(self, args):
def run(self, args): def run(self, args):
os.umask(args.umask) # early, before opening files os.umask(args.umask) # early, before opening files
self.lock_wait = args.lock_wait self.lock_wait = args.lock_wait
# This works around http://bugs.python.org/issue9351 func = get_func(args)
func = getattr(args, 'func', None) or getattr(args, 'fallback_func')
# do not use loggers before this! # do not use loggers before this!
is_serve = func == self.do_serve is_serve = func == self.do_serve
setup_logging(level=args.log_level, is_serve=is_serve, json=args.log_json) setup_logging(level=args.log_level, is_serve=is_serve, json=args.log_json)