core: getProfileName no raise ProfileUnknownError + minor doc fixes

This commit is contained in:
Goffi 2015-08-16 00:41:58 +02:00
commit 0f10526746
3 changed files with 9 additions and 4 deletions

View file

@ -154,7 +154,8 @@ class Discovery(object):
@param type_: identitiy's type
@param jid_: the jid of the target server (None for profile's server)
@param profile_key: %(doc_profile_key)s
@return: a set of entities or None if no cached data were found
@return: a set of found entities
@raise CancelError: the request timed out
"""
found_entities = set()

View file

@ -361,6 +361,7 @@ class Memory(object):
@param profile_key: can be the profile name or a keywork (like @DEFAULT@)
@param return_profile_keys: if True, return unmanaged profile keys (like "@ALL@"). This keys must be managed by the caller
@return: requested profile name or emptry string if it doesn't exist
@raise exceptions.ProfileUnknownError if profile doesn't exists
"""
return self.params.getProfileName(profile_key, return_profile_keys)

View file

@ -186,7 +186,9 @@ class Params(object):
@ALL@ for all profiles
@DEFAULT@ for default profile
@param return_profile_keys: if True, return unmanaged profile keys (like "@ALL@"). This keys must be managed by the caller
@return: requested profile name or emptry string if it doesn't exist"""
@return: requested profile name
@raise exceptions.ProfileUnknownError if profile doesn't exists
"""
if profile_key == '@DEFAULT@':
default = self.host.memory.memory_data.get('Profile_default')
if not default:
@ -203,7 +205,7 @@ class Params(object):
return profile_key # this value must be managed by the caller
if not self.storage.hasProfile(profile_key):
log.error(_(u'Trying to access an unknown profile (%s)') % profile_key)
return "" # FIXME: raise exceptions.ProfileUnknownError here (must be well checked, this method is used in lot of places)
raise exceptions.ProfileUnknownError
return profile_key
def __get_unique_node(self, parent, tag, name):