summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-04-07 23:32:15 -0700
committerNathan Fritz <nathan@andyet.net>2010-04-07 23:32:15 -0700
commitdd77d2165d5c3175cc4adda07520d6054ff0c934 (patch)
treee516594137be3535e06421e4c339d44fef7dba35
parentecd5a172ed49cbdf69cb3eaf0786fd18d801ee65 (diff)
downloadslixmpp-dd77d2165d5c3175cc4adda07520d6054ff0c934.tar.gz
slixmpp-dd77d2165d5c3175cc4adda07520d6054ff0c934.tar.bz2
slixmpp-dd77d2165d5c3175cc4adda07520d6054ff0c934.tar.xz
slixmpp-dd77d2165d5c3175cc4adda07520d6054ff0c934.zip
added missing docstrings to tests and added deprecated warning to basexmpp.send when using xml mask waiting
-rw-r--r--sleekxmpp/basexmpp.py1
-rw-r--r--tests/test_pubsubstanzas.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 585ecacb..764f8c55 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -139,6 +139,7 @@ class basexmpp(object):
mask = mask.xml
data = str(data)
if mask is not None:
+ logging.warning("Use of send mask waiters is deprecated")
waitfor = Waiter('SendWait_%s' % self.getNewId(), MatchXMLMask(mask))
self.registerHandler(waitfor)
self.sendRaw(data)
diff --git a/tests/test_pubsubstanzas.py b/tests/test_pubsubstanzas.py
index 4c3737d7..4f9faf75 100644
--- a/tests/test_pubsubstanzas.py
+++ b/tests/test_pubsubstanzas.py
@@ -61,6 +61,7 @@ class testpubsubstanzas(unittest.TestCase):
self.failUnless(xmlstring == str(iq) == str(iq2) == str(iq3))
def testItems(self):
+ "Testing iq/pubsub/items stanzas"
iq = self.ps.Iq()
iq['pubsub']['items']
payload = ET.fromstring("""<thinger xmlns="http://andyet.net/protocol/thinger" x="1" y='2'><child1 /><child2 normandy='cheese' foo='bar' /></thinger>""")
@@ -81,6 +82,7 @@ class testpubsubstanzas(unittest.TestCase):
self.failUnless(xmlstring == str(iq) == str(iq2) == str(iq3))
def testCreate(self):
+ "Testing iq/pubsub/create&configure stanzas"
from sleekxmpp.plugins import xep_0004
iq = self.ps.Iq()
iq['pubsub']['create']['configure']
@@ -96,6 +98,7 @@ class testpubsubstanzas(unittest.TestCase):
self.failUnless(xmlstring == str(iq) == str(iq2) == str(iq3))
def testDefault(self):
+ "Testing iq/default stanzas"
from sleekxmpp.plugins import xep_0004
iq = self.ps.Iq()
iq['pubsub']['default']
@@ -111,6 +114,7 @@ class testpubsubstanzas(unittest.TestCase):
self.failUnless(xmlstring == str(iq) == str(iq2) == str(iq3))
def testSubscribe(self):
+ "Testing iq/pubsub/subscribe stanzas"
from sleekxmpp.plugins import xep_0004
iq = self.ps.Iq()
iq['pubsub']['subscribe']['options']
@@ -129,6 +133,7 @@ class testpubsubstanzas(unittest.TestCase):
self.failUnless(xmlstring == str(iq) == str(iq2) == str(iq3))
def testPublish(self):
+ "Testing iq/pubsub/publish stanzas"
iq = self.ps.Iq()
iq['pubsub']['publish']['node'] = 'thingers'
payload = ET.fromstring("""<thinger xmlns="http://andyet.net/protocol/thinger" x="1" y='2'><child1 /><child2 normandy='cheese' foo='bar' /></thinger>""")