diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2012-03-15 04:32:37 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-03-28 14:04:31 +0200 |
| commit | a2299070c86ae049fb5702a72567a820fe6eaa28 (patch) | |
| tree | 6508cc953da352a626a3b0bbd18b3ba077b60994 /ipalib/plugins | |
| parent | 5a55e11a2540b9fa7c0af04b375d9bdaf277642d (diff) | |
| download | freeipa-a2299070c86ae049fb5702a72567a820fe6eaa28.tar.gz freeipa-a2299070c86ae049fb5702a72567a820fe6eaa28.tar.xz freeipa-a2299070c86ae049fb5702a72567a820fe6eaa28.zip | |
Change parameters to use only default_from for dynamic default values.
Replace all occurences of create_default with equivalent default_from
and remove create_default from the framework. This is needed for
proper parameter validation, as there is no way to tell which
parameters to validate prior to calling create_default, because
create_default does not provide information about which parameters are
used for generating the default value.
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/dns.py | 4 | ||||
| -rw-r--r-- | ipalib/plugins/passwd.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 24b8357a4..b7069fb7a 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -234,7 +234,7 @@ def _rname_validator(ugettext, zonemgr): return unicode(e) return None -def _create_zone_serial(**kwargs): +def _create_zone_serial(): """ Generate serial number for zones. The format follows RFC 1912 """ return int('%s01' % time.strftime('%Y%m%d')) @@ -1554,7 +1554,7 @@ class dnszone(LDAPObject): label=_('SOA serial'), doc=_('SOA record serial number'), minvalue=1, - create_default=_create_zone_serial, + default_from=_create_zone_serial, autofill=True, ), Int('idnssoarefresh', diff --git a/ipalib/plugins/passwd.py b/ipalib/plugins/passwd.py index b26f7e9fd..9bee314ec 100644 --- a/ipalib/plugins/passwd.py +++ b/ipalib/plugins/passwd.py @@ -69,7 +69,7 @@ class passwd(Command): label=_('User name'), primary_key=True, autofill=True, - create_default=lambda **kw: util.get_current_principal(), + default_from=lambda: util.get_current_principal(), normalizer=lambda value: normalize_principal(value), ), Password('password', |