summaryrefslogtreecommitdiffstats
path: root/ipalib/public.py
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2008-09-19 00:00:54 +0000
committerJason Gerard DeRose <jderose@redhat.com>2008-09-19 00:00:54 +0000
commit1ec4f379f5eb0b77e6ca90c777e2e976c28ddfca (patch)
treec07cc9e9c87380e8903f9e27ac1eb0d3aeebd656 /ipalib/public.py
parentf29c827d06cb455709d3b07baf727913381709ca (diff)
downloadfreeipa.git-1ec4f379f5eb0b77e6ca90c777e2e976c28ddfca.tar.gz
freeipa.git-1ec4f379f5eb0b77e6ca90c777e2e976c28ddfca.tar.xz
freeipa.git-1ec4f379f5eb0b77e6ca90c777e2e976c28ddfca.zip
302: Removed depreciated Command.group_args() method
Diffstat (limited to 'ipalib/public.py')
-rw-r--r--ipalib/public.py36
1 files changed, 2 insertions, 34 deletions
diff --git a/ipalib/public.py b/ipalib/public.py
index 967f88ce..a8397a54 100644
--- a/ipalib/public.py
+++ b/ipalib/public.py
@@ -227,7 +227,8 @@ class Command(plugable.Plugin):
'smart_option_order',
'args',
'options',
- 'group_args',
+ 'args_to_kw',
+ 'kw_to_args',
))
takes_options = tuple()
takes_args = tuple()
@@ -354,39 +355,6 @@ class Command(plugable.Plugin):
for option in sorted(self.options(), key=get_key):
yield option
- def group_args(self, *values):
- args = tuple(self.args())
- if len(args) == 0:
- if len(values) > 0:
- raise errors.ArgumentError(self, 'takes no arguments')
- else:
- return tuple()
- if len(values) > len(args) and not args[-1].multivalue:
- if len(args) == 1:
- error = 'takes at most 1 argument'
- else:
- error = 'takes at most %d arguments' % len(args)
- raise errors.ArgumentError(self, error)
- min_args = sum(int(a.required) for a in args)
- if len(values) < min_args:
- if min_args == 1:
- error = 'takes at least 1 argument'
- else:
- error = 'takes at least %d arguments' % min_args
- raise errors.ArgumentError(self, error)
- return tuple(self.__group_args_iter(values, args))
-
- def __group_args_iter(self, values, args):
- for (i, arg) in enumerate(args):
- if len(values) > i:
- if arg.multivalue:
- yield values[i:]
- else:
- yield values[i]
- else:
- assert not arg.required
- yield None
-
def args_to_kw(self, *values):
if self.max_args is not None and len(values) > self.max_args:
if self.max_args == 0: