From fdf47ccf128645bd099f7da80487320e086d17fe Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 12 Aug 2013 09:40:08 -0400 Subject: testsuite: fixed more unit tests --- src/lib/Bcfg2/Options/Subcommands.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Options') diff --git a/src/lib/Bcfg2/Options/Subcommands.py b/src/lib/Bcfg2/Options/Subcommands.py index b529dd7fe..7d7a3f928 100644 --- a/src/lib/Bcfg2/Options/Subcommands.py +++ b/src/lib/Bcfg2/Options/Subcommands.py @@ -197,8 +197,10 @@ class CommandRegistry(object): cmd_obj = cmdcls() name = cmdcls.__name__.lower() cls.commands[name] = cmd_obj + # py2.5 can't mix *magic and non-magical keyword args, thus + # the **dict(...) cls.options.append( - Subparser(*cmdcls.options, name=name, help=cmdcls.__doc__)) + Subparser(*cmdcls.options, **dict(name=name, help=cmdcls.__doc__))) if issubclass(cls, cmd.Cmd) and cmdcls.interactive: setattr(cls, "do_%s" % name, cmd_obj) setattr(cls, "help_%s" % name, cmd_obj.parser.print_help) -- cgit v1.2.3-1-g7c22