# HG changeset patch # User Goffi # Date 1423244786 -3600 # Node ID e2f71b7157087e97ae38cf729fde20c73a496c85 # Parent 0541cb64217ed04308c3bda4de7b6740451481ff core: better use of C.bool: C.bool only accept basestring subclasses and return the associated constant, C.boolConst return the associated constant for a boolean value diff -r 0541cb64217e -r e2f71b715708 src/core/constants.py --- a/src/core/constants.py Mon Jan 26 02:03:16 2015 +0100 +++ b/src/core/constants.py Fri Feb 06 18:46:26 2015 +0100 @@ -219,14 +219,12 @@ @classmethod def bool(cls, value): - """@return: bool value for any type""" - if isinstance(value, str) or isinstance(value, unicode): # dbus.String is unicode but not str - return value.lower() == cls.BOOL_TRUE - return bool(value) + """@return (bool): bool value for associated constant""" + assert isinstance(value, basestring) + return value.lower() == cls.BOOL_TRUE @classmethod - def str(cls, value): - """@return: str text value for any type""" - if isinstance(value, bool): - return cls.BOOL_TRUE if value else cls.BOOL_FALSE - return str(value) + def boolConst(cls, value): + """@return (str): constant associated to bool value""" + assert isinstance(value, bool) + return cls.BOOL_TRUE if value else cls.BOOL_FALSE