changeset 1ff08c474cac in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1ff08c474cac description: better coding style

diffstat:

src/common/xmpp/auth_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 7c61c3c1245e -r 1ff08c474cac src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sun Apr 18 20:43:40 2010 +0200 +++ b/src/common/xmpp/auth_nb.py Sun Apr 18 20:57:47 2010 +0200 @@ -213,9 +213,12 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, - payload=[base64.encodestring('%s@%s' % (self.username, - self._owner.Server)).replace('\n', '')]) + sasl_data = u'%s@%s' % (self.username, self._owner.Server) + sasl_data = sasl_data.encode('utf-8').encode('base64').replace( + '\n', '') + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) + self.mechanism = 'EXTERNAL' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed