summaryrefslogtreecommitdiffstats
path: root/ipalib/cli.py
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2008-09-10 02:02:26 +0000
committerJason Gerard DeRose <jderose@redhat.com>2008-09-10 02:02:26 +0000
commit8062075f847199157910114588ea3c27874bdf35 (patch)
tree219589e91bb9571d1bff29f25469fb8eb9c2f8d7 /ipalib/cli.py
parent0d3be2f421c3cd4044c4d7616d9426ac58a71ce8 (diff)
downloadfreeipa.git-8062075f847199157910114588ea3c27874bdf35.tar.gz
freeipa.git-8062075f847199157910114588ea3c27874bdf35.tar.xz
freeipa.git-8062075f847199157910114588ea3c27874bdf35.zip
279: Fixed cli and public.Method re new Command.args attribute
Diffstat (limited to 'ipalib/cli.py')
-rw-r--r--ipalib/cli.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index a6bc0f1f..25a0a5b8 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -51,12 +51,7 @@ def from_cli(cli_name):
class help(public.Application):
'Display help on a command.'
- takes_args = (
- public.Option('command', ipa_types.Unicode(),
- required=True,
- multivalue=True,
- ),
- )
+ takes_args = ['command']
def __call__(self, key):
key = str(key)
@@ -245,7 +240,7 @@ class CLI(object):
def get_usage_iter(self, cmd):
yield 'Usage: %%prog %s' % to_cli(cmd.name)
- for arg in cmd.takes_args:
+ for arg in cmd.args():
name = to_cli(arg.name).upper()
if arg.multivalue:
name = '%s...' % name
@@ -254,8 +249,6 @@ class CLI(object):
else:
yield '[%s]' % name
-
-
def __get_mcl(self):
"""
Returns the Max Command Length.