diff options
author | Rob Crittenden <rcritten@redhat.com> | 2009-11-04 09:41:48 -0500 |
---|---|---|
committer | Jason Gerard DeRose <jderose@redhat.com> | 2009-11-17 09:36:38 -0700 |
commit | 680bf7c54863452263b9cd324ede444fd438436d (patch) | |
tree | 2f81be6443cb44d5bb4c37237001399d79f52414 /ipalib/parameters.py | |
parent | 1d1d82fda4c499f16ec1d74d8b9b63e03ecae144 (diff) | |
download | freeipa-680bf7c54863452263b9cd324ede444fd438436d.tar.gz freeipa-680bf7c54863452263b9cd324ede444fd438436d.tar.xz freeipa-680bf7c54863452263b9cd324ede444fd438436d.zip |
_convert_scalar() should throw an error if passed a tuple or list
A parameter needs to have multivalue set in order to work on lists/tuples
and even then _convert_scalar() will be sent one value at a time.
Diffstat (limited to 'ipalib/parameters.py')
-rw-r--r-- | ipalib/parameters.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 0630915cb..227757d63 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -227,6 +227,9 @@ class Param(ReadOnly): # Subclasses should override this with something more specific: type_error = _('incorrect type') + # _convert_scalar operates only on scalar values + scalar_error = _('Only one value is allowed') + kwargs = ( ('cli_name', str, None), ('cli_short_name', str, None), @@ -810,6 +813,9 @@ class Bool(Param): return True if value in self.falsehoods: return False + if type(value) in (tuple, list): + raise ConversionError(name=self.name, index=index, + error=ugettext(self.scalar_error)) raise ConversionError(name=self.name, index=index, error=ugettext(self.type_error), ) @@ -873,6 +879,9 @@ class Number(Param): return self.type(value) except ValueError: pass + if type(value) in (tuple, list): + raise ConversionError(name=self.name, index=index, + error=ugettext(self.scalar_error)) raise ConversionError(name=self.name, index=index, error=ugettext(self.type_error), ) @@ -1106,6 +1115,9 @@ class Str(Data): return value if type(value) in (int, float): return self.type(value) + if type(value) in (tuple, list): + raise ConversionError(name=self.name, index=index, + error=ugettext(self.scalar_error)) raise ConversionError(name=self.name, index=index, error=ugettext(self.type_error), ) |