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

349: Improved clarity of local variables in Param.__init__()

Browse Source
This commit is contained in:
Jason Gerard DeRose 2008-09-24 21:57:34 +00:00
parent 250a01b5b7
commit 755ea8d0c2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipalib/frontend.py
View File

@ -136,28 +136,28 @@ class Param(plugable.ReadOnly):
primary_key=False, primary_key=False,
) )
def __init__(self, name, type_=ipa_types.Unicode(), **kw): def __init__(self, name, type_=ipa_types.Unicode(), **override):
if 'required' not in kw and 'multivalue' not in kw: if not ('required' in override or 'multivalue' in override):
(name, kw_from_spec) = parse_param_spec(name) (name, kw_from_spec) = parse_param_spec(name)
kw.update(kw_from_spec) override.update(kw_from_spec)
default = dict(self.__default) kw = dict(self.__default)
if not set(default).issuperset(kw): if not set(kw).issuperset(override):
extra = sorted(set(kw) - set(default)) extra = sorted(set(override) - set(kw))
raise TypeError( raise TypeError(
'Param.__init__() takes no such kwargs: %s' % ', '.join(extra) 'Param.__init__() takes no such kwargs: %s' % ', '.join(extra)
) )
default.update(kw) kw.update(override)
self.__kw = default self.__kw = kw
self.name = check_name(name) self.name = check_name(name)
self.type = check_isinstance(type_, ipa_types.Type, 'type_') self.type = check_isinstance(type_, ipa_types.Type, 'type_')
self.doc = self.__check_type(str, 'doc') self.doc = self.__check_type(str, 'doc')
self.required = self.__check_type(bool, 'required') self.required = self.__check_type(bool, 'required')
self.multivalue = self.__check_type(bool, 'multivalue') self.multivalue = self.__check_type(bool, 'multivalue')
self.default = self.__kw['default'] self.default = kw['default']
self.default_from = self.__check_type(DefaultFrom, 'default_from', self.default_from = self.__check_type(DefaultFrom, 'default_from',
allow_none=True allow_none=True
) )
self.__normalize = self.__kw['normalize'] self.__normalize = kw['normalize']
self.rules = self.__check_type(tuple, 'rules') self.rules = self.__check_type(tuple, 'rules')
self.all_rules = (type_.validate,) + self.rules self.all_rules = (type_.validate,) + self.rules
self.primary_key = self.__check_type(bool, 'primary_key') self.primary_key = self.__check_type(bool, 'primary_key')