Merge branch 'develop' into stream_features

2011-05-25 15:53:33 -07:00 · 2011-05-25 15:53:33 -07:00 · ccb0eeefbd
commit ccb0eeefbd
parent 9851a2a057 ec9aed5b75
1 changed files with 1 additions and 1 deletions
--- 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("""