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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-10-31 00:17:26 -07:00
commit a00eee1bbe
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ibb_transfer/ibb_receiver.py
View File

@ -85,7 +85,7 @@ class IBBReceiver(sleekxmpp.ClientXMPP):
def stream_opened(self, stream): def stream_opened(self, stream):
# NOTE: IBB streams are bi-directional, so the original sender is # NOTE: IBB streams are bi-directional, so the original sender is
# now the opened stream's receiver. # now the opened stream's receiver.
print('Stream opened: %s from ' % (stream.sid, stream.receiver)) print('Stream opened: %s from %s' % (stream.sid, stream.receiver))
# You could run a loop reading from the stream using stream.recv(), # You could run a loop reading from the stream using stream.recv(),
# or use the ibb_stream_data event. # or use the ibb_stream_data event.

2
sleekxmpp/plugins/xep_0047/stanza.py
View File

@ -14,7 +14,7 @@ def to_b64(data):
def from_b64(data): def from_b64(data):
return bytes(base64.b64decode(bytes(data))).decode('utf-8') return bytes(base64.b64decode(bytes(data)))
class Open(ElementBase): class Open(ElementBase):

2
tests/test_stream_xep_0047.py
View File

@ -174,7 +174,7 @@ class TestInBandByteStreams(SleekTest):
to="tester@localhost/receiver" /> to="tester@localhost/receiver" />
""") """)
self.assertEqual(data, ['it works!']) self.assertEqual(data, [b'it works!'])
suite = unittest.TestLoader().loadTestsFromTestCase(TestInBandByteStreams) suite = unittest.TestLoader().loadTestsFromTestCase(TestInBandByteStreams)