diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-08-16 22:37:25 +0200 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2014-09-01 02:42:45 +0200 |
commit | 0e950154103ba9385b13f76548befa87509995f3 (patch) | |
tree | 14f38018f0ca25deed5729c7f4c9fd84779e5655 /slixmpp/plugins/xep_0078 | |
parent | b92dac72f3bb601837dde507597d47715c5ad1aa (diff) | |
download | slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.gz slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.bz2 slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.xz slixmpp-0e950154103ba9385b13f76548befa87509995f3.zip |
Remove sys.version_info checks for python2 and clean some imports.
Diffstat (limited to 'slixmpp/plugins/xep_0078')
-rw-r--r-- | slixmpp/plugins/xep_0078/legacyauth.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/slixmpp/plugins/xep_0078/legacyauth.py b/slixmpp/plugins/xep_0078/legacyauth.py index 9c49d346..0bcfb3d0 100644 --- a/slixmpp/plugins/xep_0078/legacyauth.py +++ b/slixmpp/plugins/xep_0078/legacyauth.py @@ -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 |