summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lance@misbehave.local>2011-05-25 15:53:33 -0700
committerLance Stout <lance@misbehave.local>2011-05-25 15:53:33 -0700
commitccb0eeefbd58361283e4e92d75e5d17aa76c70c7 (patch)
tree1e099bbd9e2b6d289aafae5e1c6fe0c3d817c1ff
parent9851a2a057aeee54300f703a39507713e7ad199a (diff)
parentec9aed5b751cac187b774794c7d8ca9de298838a (diff)
downloadslixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.gz
slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.bz2
slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.tar.xz
slixmpp-ccb0eeefbd58361283e4e92d75e5d17aa76c70c7.zip
Merge branch 'develop' into stream_features
-rw-r--r--tests/test_stream_roster.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index 15b8683a..e1aa1766 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -136,7 +136,7 @@ class TestStreamRoster(SleekTest):
# Since get_roster blocks, we need to run it in a thread.
t = threading.Thread(name='get_roster',
target=self.xmpp.get_roster,
- kwargs={'callback': roster_callback})
+ kwargs={str('callback'): roster_callback})
t.start()
self.send("""