summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2008-12-17 18:32:46 -0700
committerJason Gerard DeRose <jderose@redhat.com>2008-12-17 18:32:46 -0700
commitba481e7712b9d92694a38399936fd0eceef93cb6 (patch)
tree4b85b35e74f508ccc45f4fc175724b2d1d94ae26 /ipalib
parente5dabc852bfdf7a4be47e4cfb300c6a2ea53a3f9 (diff)
downloadfreeipa.git-ba481e7712b9d92694a38399936fd0eceef93cb6.tar.gz
freeipa.git-ba481e7712b9d92694a38399936fd0eceef93cb6.tar.xz
freeipa.git-ba481e7712b9d92694a38399936fd0eceef93cb6.zip
New Param: split class_rules and *rules into separate attributes
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/parameter.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/ipalib/parameter.py b/ipalib/parameter.py
index e4268825..9653e168 100644
--- a/ipalib/parameter.py
+++ b/ipalib/parameter.py
@@ -211,7 +211,7 @@ class Param(ReadOnly):
(name, kw_from_spec) = parse_param_spec(name)
kw.update(kw_from_spec)
self.name = check_name(name)
- self.nice = '%s(%r)' % (self.__class__.__name__, self.name)
+ self.nice = '%s(%r)' % (self.__class__.__name__, self.param_spec)
# Add 'default' to self.kwargs and makes sure no unknown kw were given:
assert type(self.type) is type
@@ -269,8 +269,10 @@ class Param(ReadOnly):
check_name(self.cli_name)
# Check that all the rules are callable
- self.rules = tuple(class_rules) + rules
- for rule in self.rules:
+ self.class_rules = tuple(class_rules)
+ self.rules = rules
+ self.all_rules = self.class_rules + self.rules
+ for rule in self.all_rules:
if not callable(rule):
raise TypeError(
'%s: rules must be callable; got %r' % (self.nice, rule)