Mercurial > libervia-backend
diff src/plugins/plugin_xep_0115.py @ 587:952322b1d490
Remove trailing whitespaces.
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> |
---|---|
date | Fri, 18 Jan 2013 17:55:34 +0100 |
parents | ca13633d3b6b |
children | beaf6bec2fcd |
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0115.py Fri Jan 18 17:55:27 2013 +0100 +++ b/src/plugins/plugin_xep_0115.py Fri Jan 18 17:55:34 2013 +0100 @@ -71,7 +71,7 @@ def __str__(self): return "%s/%s/%s/%s" % (self.category, self.idType, self.lang, self.name) - + class XEP_0115(): cap_hash = None #capabilities hash is class variable as it is common to all profiles @@ -83,7 +83,7 @@ host.trigger.add("Disco Handled", self.checkHash) self.hash_cache = PersistentBinaryDict(NS_ENTITY_CAPABILITY) #key = hash or jid, value = features self.hash_cache.load() - self.jid_hash = {} #jid to hash mapping, map to a discoInfo features if the hash method is unknown + self.jid_hash = {} #jid to hash mapping, map to a discoInfo features if the hash method is unknown def checkHash(self, profile): if not XEP_0115.cap_hash: @@ -91,7 +91,7 @@ else: self.presenceHack(profile) return True - + def getHandler(self, profile): return XEP_0115_handler(self, profile) @@ -127,7 +127,7 @@ if not client: error ('Requesting hash for an inexistant client') raise HashGenerationError - + def generateHash_2(services, profile): _s=[] byte_identities = [ByteIdentity(identity) for identity in filter(lambda x:isinstance(x,disco.DiscoIdentity),services)] #FIXME: lang must be managed here @@ -146,12 +146,12 @@ XEP_0115.cap_hash = b64encode(sha1(''.join(_s)).digest()) debug(_('Capability hash generated: [%s]') % XEP_0115.cap_hash) self.presenceHack(profile) - + services = client.discoHandler.info(client.jid, client.jid, '').addCallback(generateHash_2, profile) - + class XEP_0115_handler(XMPPHandler): implements(iwokkel.IDisco) - + def __init__(self, plugin_parent, profile): self.plugin_parent = plugin_parent self.host = plugin_parent.host @@ -159,7 +159,7 @@ def connectionInitialized(self): self.xmlstream.addObserver(CAPABILITY_UPDATE, self.update) - + def getDiscoInfo(self, requestor, target, nodeIdentifier=''): return [disco.DiscoFeature(NS_ENTITY_CAPABILITY)]