From 436841fa6faa1b9be5f40bb17f606366790ef5e8 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Mon, 31 Aug 2009 23:02:19 +0000 Subject: brought components over to python 3.x --- sleekxmpp/component_example.py | 1 - sleekxmpp/componentxmpp.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sleekxmpp/component_example.py b/sleekxmpp/component_example.py index 37b7e96e..f24216c2 100644 --- a/sleekxmpp/component_example.py +++ b/sleekxmpp/component_example.py @@ -17,7 +17,6 @@ class Example(sleekxmpp.componentxmpp.ComponentXMPP): pass def message(self, event): - print event self.sendMessage("%s/%s" % (event['jid'], event['resource']), "Thanks for sending me, \"%s\"." % event['message'], mtype=event['type']) if __name__ == '__main__': diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index 28b58172..7f952413 100755 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -39,7 +39,7 @@ import random import copy from . import plugins from . import stanza -import sha +import hashlib srvsupport = True try: import dns.resolver @@ -96,7 +96,7 @@ class ComponentXMPP(basexmpp, XMLStream): def start_stream_handler(self, xml): sid = xml.get('id', '') handshake = ET.Element('{jabber:component:accept}handshake') - handshake.text = sha.new(u"%s%s" % (sid, self.secret)).hexdigest().lower() + handshake.text = hashlib.sha1.new(b"%s%s" % (sid, self.secret)).hexdigest().lower() self.send(handshake) def _handleHandshake(self, xml): -- cgit v1.2.3