Merge branch 'develop' into roster

Conflicts:
	setup.py
This commit is contained in:
Lance Stout
2011-08-04 11:52:17 -07:00
57 changed files with 3147 additions and 914 deletions

View File

@@ -1,6 +1,6 @@
from sleekxmpp.test import *
import sleekxmpp.plugins.xep_0004 as xep_0004
import sleekxmpp.plugins.stanza_pubsub as pubsub
import sleekxmpp.plugins.xep_0060.stanza as pubsub
class TestPubsubStanzas(SleekTest):

View File

@@ -102,11 +102,13 @@ class TestToString(SleekTest):
"""
Test that stanza objects are serialized properly.
"""
self.stream_start()
utf8_message = '\xe0\xb2\xa0_\xe0\xb2\xa0'
if not hasattr(utf8_message, 'decode'):
# Python 3
utf8_message = bytes(utf8_message, encoding='utf-8')
msg = Message()
msg = self.Message()
msg['body'] = utf8_message.decode('utf-8')
expected = '<message><body>\xe0\xb2\xa0_\xe0\xb2\xa0</body></message>'
result = msg.__str__()