jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stream_features

Browse Source
This commit is contained in:
Lance Stout
2011-04-26 16:33:42 -04:00
parent ea8c40c7b6 5399fdd3a9
commit b1439df72a
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/plugins/stanza_pubsub.py
View File

@@ -237,6 +237,8 @@ class Unsubscribe(ElementBase):
def getJid(self): def getJid(self):
return JID(self._getAttr('jid')) return JID(self._getAttr('jid'))
registerStanzaPlugin(Pubsub, Unsubscribe)
class Subscribe(ElementBase): class Subscribe(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub' namespace = 'http://jabber.org/protocol/pubsub'
name = 'subscribe' name = 'subscribe'

5
sleekxmpp/test/sleektest.py
View File

@@ -600,8 +600,13 @@ class SleekTest(unittest.TestCase):
Defaults to the value of self.match_method. Defaults to the value of self.match_method.
""" """
sent = self.xmpp.socket.next_sent(timeout) sent = self.xmpp.socket.next_sent(timeout)
if data is None and sent is None:
return
if data is None and sent is not None:
self.fail("Stanza data was sent: %s" % sent)
if sent is None: if sent is None:
self.fail("No stanza was sent.") self.fail("No stanza was sent.")
xml = self.parse_xml(sent) xml = self.parse_xml(sent)
self.fix_namespaces(xml, 'jabber:client') self.fix_namespaces(xml, 'jabber:client')
sent = self.xmpp._build_stanza(xml, 'jabber:client') sent = self.xmpp._build_stanza(xml, 'jabber:client')