diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2009-01-21 23:56:55 -0700 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2009-02-03 15:29:00 -0500 |
| commit | f3a84683d24724f7a647e9ebf0f306c6da60b60d (patch) | |
| tree | bfb40a0053e50d1f299966043ec37c835fc9642e /ipalib/cli.py | |
| parent | ae39dece1386dbc3e9a07977a538d9b87acb5e30 (diff) | |
| download | freeipa-f3a84683d24724f7a647e9ebf0f306c6da60b60d.tar.gz freeipa-f3a84683d24724f7a647e9ebf0f306c6da60b60d.tar.xz freeipa-f3a84683d24724f7a647e9ebf0f306c6da60b60d.zip | |
Removed depreciated Command.args_to_kw() method; updated CLI to use Command.args_options_2_params() instead
Diffstat (limited to 'ipalib/cli.py')
| -rw-r--r-- | ipalib/cli.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index fb2fd95f4..9eb3c0920 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -705,7 +705,7 @@ class CLI(object): del kw[param.name] except KeyError: pass - (args, options) = cmd.params_2_args_options(kw) + (args, options) = cmd.params_2_args_options(**kw) cmd.output_for_cli(self.api.Backend.textui, result, *args, **options) def set_defaults(self, cmd, kw): @@ -784,11 +784,8 @@ class CLI(object): (kwc, args) = parser.parse_args( list(self.cmd_argv[1:]), KWCollector() ) - kw = kwc.__todict__() - arg_kw = cmd.args_to_kw(*args) - assert set(arg_kw).intersection(kw) == set() - kw.update(arg_kw) - return kw + options = kwc.__todict__() + return cmd.args_options_2_params(*args, **options) def build_parser(self, cmd): parser = optparse.OptionParser( |