summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lance@misbehave.local>2011-05-25 15:53:24 -0700
committerLance Stout <lance@misbehave.local>2011-05-25 15:53:24 -0700
commit62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925 (patch)
treec1df1303591fc3130112a18d791a54d9fff25a29
parentbb2bc64d15fd33b66193326554b67e9f71d6f90f (diff)
parentec9aed5b751cac187b774794c7d8ca9de298838a (diff)
downloadslixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.gz
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.bz2
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.xz
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.zip
Merge branch 'develop' into roster
-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 3bd71fc6..69e5ca13 100644
--- 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("""