jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove sys.version_info checks for python2 and clean some imports.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot
2014-08-16 22:37:25 +02:00
committed by Florent Le Coz
parent b92dac72f3
commit 0e95015410
13 changed files with 23 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slixmpp/plugins/xep_0078/legacyauth.py
View File

@@ -9,8 +9,6 @@
import uuid
import logging
import hashlib
import random
import sys
from slixmpp.jid import JID
from slixmpp.exceptions import IqError, IqTimeout
@@ -105,12 +103,8 @@ class XEP_0078(BasePlugin):
if 'digest' in resp['auth']['fields']:
log.debug('Authenticating via jabber:iq:auth Digest')
if sys.version_info < (3, 0):
stream_id = bytes(self.xmpp.stream_id)
password = bytes(self.xmpp.password)
else:
stream_id = bytes(self.xmpp.stream_id, encoding='utf-8')
password = bytes(self.xmpp.password, encoding='utf-8')
stream_id = bytes(self.xmpp.stream_id, encoding='utf-8')
password = bytes(self.xmpp.password, encoding='utf-8')
digest = hashlib.sha1(b'%s%s' % (stream_id, password)).hexdigest()
iq['auth']['digest'] = digest