copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove the sequence constraint, that is never used

Browse source
This commit is contained in:
Alexander Cherniuk 2010-02-26 12:53:06 +02:00
parent c272fce312
commit 455b1df248
1 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/command_system/mapping.py
View file

@ -24,7 +24,6 @@ according to the command properties.
import re import re
from types import BooleanType, UnicodeType from types import BooleanType, UnicodeType
from types import TupleType, ListType
from operator import itemgetter from operator import itemgetter
from errors import DefinitionError, CommandError from errors import DefinitionError, CommandError
@ -125,10 +124,6 @@ def adapt_arguments(command, arguments, args, opts):
an option which does not take an argument. If a switch is followed an option which does not take an argument. If a switch is followed
by an argument - then this argument will be treated just like a by an argument - then this argument will be treated just like a
normal positional argument. normal positional argument.
If the initial value of a keyword argument is a sequence, that is a
tuple or list - then a value of this option will be considered
correct only if it is present in the sequence.
""" """
spec_args, spec_kwargs, var_args, var_kwargs = command.extract_specification() spec_args, spec_kwargs, var_args, var_kwargs = command.extract_specification()
norm_kwargs = dict(spec_kwargs) norm_kwargs = dict(spec_kwargs)
@ -274,25 +269,6 @@ def adapt_arguments(command, arguments, args, opts):
if not isinstance(value, BooleanType): if not isinstance(value, BooleanType):
raise CommandError("%s: Switch can not take an argument" % key, command) raise CommandError("%s: Switch can not take an argument" % key, command)
# Detect every sequence constraint and ensure that if corresponding
# options are given - they contain proper values, within the
# constraint range.
for key, value in opts:
initial = norm_kwargs.get(key)
if isinstance(initial, (TupleType, ListType)):
if value not in initial:
raise CommandError("%s: Invalid argument" % key, command)
# If argument to an option constrained by a sequence was not given -
# then it's value should be set to None.
for spec_key, spec_value in spec_kwargs:
if isinstance(spec_value, (TupleType, ListType)):
for key, value in opts:
if spec_key == key:
break
else:
opts.append((spec_key, None))
# We need to encode every keyword argument to a simple string, not # We need to encode every keyword argument to a simple string, not
# the unicode one, because ** expansion does not support it. # the unicode one, because ** expansion does not support it.
for index, (key, value) in enumerate(opts): for index, (key, value) in enumerate(opts):
@ -331,8 +307,6 @@ def generate_usage(command, complete=True):
if isinstance(value, BooleanType): if isinstance(value, BooleanType):
value = str() value = str()
elif isinstance(value, (TupleType, ListType)):
value = '={%s}' % ', '.join(value)
else: else:
value = '=%s' % value value = '=%s' % value