IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where List parameters where always cloned with keywords parsed from name.

Browse Source
This commit is contained in:
Pavel Zuna 2009-06-01 18:59:58 +02:00 committed by Rob Crittenden
parent 8345e8e1f1
commit a1548bc670
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipalib/parameters.py
View File

@ -251,9 +251,11 @@ class Param(ReadOnly):
self.password = False
# Merge in kw from parse_param_spec():
if not ('required' in kw or 'multivalue' in kw):
(name, kw_from_spec) = parse_param_spec(name)
kw.update(kw_from_spec)
(name, kw_from_spec) = parse_param_spec(name)
if not 'required' in kw:
kw['required'] = kw_from_spec['required']
if not 'multivalue' in kw:
kw['multivalue'] = kw_from_spec['multivalue']
self.name = check_name(name)
self.nice = '%s(%r)' % (self.__class__.__name__, self.param_spec)
@ -1175,9 +1177,7 @@ class List(Param):
yield [unicode(cell, 'utf-8') for cell in row]
def __init__(self, name, *rules, **kw):
(name, kw_from_spec) = parse_param_spec(name)
kw.update(kw_from_spec)
kw.update(multivalue=True)
kw['multivalue'] = True
super(List, self).__init__(name, *rules, **kw)
def normalize(self, value):
@ -1235,3 +1235,4 @@ def create_param(spec):
TYPE_ERROR % ('spec', (str, Param), spec, type(spec))
)
return Str(spec)