# HG changeset patch # User Goffi # Date 1429259981 -7200 # Node ID 66a7586e49f883a4462610e3d3a75513248a2ac0 # Parent 7eb4d15650dce78bf73033f5a5273312fcc7225a tmp (mam): fixed name shadowing + getDiscoInfo for mam fix: getDiscoInfo now only returns MAM namespace when there is no node specified, this avoid having mam everywhere (which was causing issues in SàT PubSub's namespace delegation) diff -r 7eb4d15650dc -r 66a7586e49f8 wokkel/mam.py --- a/wokkel/mam.py Thu Jan 15 21:02:41 2015 +0100 +++ b/wokkel/mam.py Fri Apr 17 10:39:41 2015 +0200 @@ -200,8 +200,8 @@ for attr in ('always', 'never'): attr_elt = mam_elt.addElement(attr) jids = getattr(self, attr) - for jid in jids: - attr_elt.addElement('jid', content=jid.full()) + for jid_ in jids: + attr_elt.addElement('jid', content=jid_.full()) return mam_elt def render(self, parent): @@ -521,6 +521,8 @@ iq.handled = True def getDiscoInfo(self, requestor, target, nodeIdentifier=''): + if nodeIdentifier: + return [] return [disco.DiscoFeature(NS_MAM)] def getDiscoItems(self, requestor, target, nodeIdentifier=''):