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

Don't special case the Password class in Param.__init__()

Browse Source
This commit is contained in:
Nathaniel McCallum 2013-09-30 13:06:37 -04:00 committed by Petr Viktorin
parent 091e8fac34
commit fd63505f6d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ipalib/parameters.py
View File

@ -370,6 +370,8 @@ class Param(ReadOnly):
# _convert_scalar operates only on scalar values # _convert_scalar operates only on scalar values
scalar_error = _('Only one value is allowed') scalar_error = _('Only one value is allowed')
password = False
kwargs = ( kwargs = (
('cli_name', str, None), ('cli_name', str, None),
('cli_short_name', str, None), ('cli_short_name', str, None),
@ -401,11 +403,6 @@ class Param(ReadOnly):
self.param_spec = name self.param_spec = name
self.__kw = dict(kw) self.__kw = dict(kw)
if isinstance(self, Password):
self.password = True
else:
self.password = False
# Merge in kw from parse_param_spec(): # Merge in kw from parse_param_spec():
(name, kw_from_spec) = parse_param_spec(name) (name, kw_from_spec) = parse_param_spec(name)
if not 'required' in kw: if not 'required' in kw:
@ -635,9 +632,8 @@ class Param(ReadOnly):
""" """
Return a value safe for logging. Return a value safe for logging.
This is used so that passwords don't get logged. If this is a This is used so that sensitive values like passwords don't get logged.
`Password` instance and ``value`` is not ``None``, a constant For example:
``u'********'`` is returned. For example:
>>> p = Password('my_password') >>> p = Password('my_password')
>>> p.safe_value(u'This is my password') >>> p.safe_value(u'This is my password')
@ -645,9 +641,6 @@ class Param(ReadOnly):
>>> p.safe_value(None) is None >>> p.safe_value(None) is None
True True
If this is not a `Password` instance, ``value`` is returned unchanged.
For example:
>>> s = Str('my_str') >>> s = Str('my_str')
>>> s.safe_value(u'Some arbitrary value') >>> s.safe_value(u'Some arbitrary value')
u'Some arbitrary value' u'Some arbitrary value'
@ -1500,6 +1493,8 @@ class Password(Str):
A parameter for passwords (stored in the ``unicode`` type). A parameter for passwords (stored in the ``unicode`` type).
""" """
password = True
kwargs = Str.kwargs + ( kwargs = Str.kwargs + (
('confirm', bool, True), ('confirm', bool, True),
) )