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

Merge branch 'develop' into roster

Browse Source 
Conflicts:
	sleekxmpp/basexmpp.py
This commit is contained in:
Lance Stout
2011-02-02 09:13:22 -05:00
parent 65931bb384 8dbe6f6546
commit de6170a13d
21 changed files with 291 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_stanza_message.py
View File

@@ -49,7 +49,7 @@ class TestMessageStanzas(SleekTest):
msg['nick']['nick'] = 'A nickname!'
self.check(msg, """
<message>
<nick xmlns="http://jabber.org/nick/nick">A nickname!</nick>
<nick xmlns="http://jabber.org/protocol/nick">A nickname!</nick>
</message>
""")

2
tests/test_stanza_presence.py
View File

@@ -59,7 +59,7 @@ class TestPresenceStanzas(SleekTest):
p['nick']['nick'] = 'A nickname!'
self.check(p, """
<presence>
<nick xmlns="http://jabber.org/nick/nick">A nickname!</nick>
<nick xmlns="http://jabber.org/protocol/nick">A nickname!</nick>
</presence>
""")