summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-02-19 01:01:09 -0800
committerLance Stout <lancestout@gmail.com>2013-02-19 01:01:09 -0800
commit9a45ebd98bb03120f1eca3945eaa8777abe8ece0 (patch)
tree5aa5e10d31a317e8360c70fbec4fb5915a289e03 /sleekxmpp
parent7f9ff9d0e758ed07054b96ca5bd66177f9853cea (diff)
parent8c763fcf43b2690c4f02a9f577fc2d6d72917ee2 (diff)
downloadslixmpp-9a45ebd98bb03120f1eca3945eaa8777abe8ece0.tar.gz
slixmpp-9a45ebd98bb03120f1eca3945eaa8777abe8ece0.tar.bz2
slixmpp-9a45ebd98bb03120f1eca3945eaa8777abe8ece0.tar.xz
slixmpp-9a45ebd98bb03120f1eca3945eaa8777abe8ece0.zip
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0078/legacyauth.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0078/legacyauth.py b/sleekxmpp/plugins/xep_0078/legacyauth.py
index 7e2d7bdf..da6bfa2c 100644
--- a/sleekxmpp/plugins/xep_0078/legacyauth.py
+++ b/sleekxmpp/plugins/xep_0078/legacyauth.py
@@ -6,6 +6,7 @@
See the file LICENSE for copying permission.
"""
+import uuid
import logging
import hashlib
import random
@@ -98,7 +99,7 @@ class XEP_0078(BasePlugin):
# A resource is required, so create a random one if necessary
resource = self.xmpp.requested_jid.resource
if not resource:
- resource = uuid.uuid4()
+ resource = str(uuid.uuid4())
iq['auth']['resource'] = resource