Merge branch 'develop' into roster

2011-05-25 15:53:24 -07:00 · 2011-05-25 15:53:24 -07:00 · 62bdaab7c7
commit 62bdaab7c7
parent bb2bc64d15 ec9aed5b75
1 changed files with 1 additions and 1 deletions
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@ -132,7 +132,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("""