changeset 5c97346d371c in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5c97346d371c description: port code to python3
diffstat:
nbxmpp/__init__.py | 12 ++++---- nbxmpp/auth_nb.py | 24 ++++++++-------- nbxmpp/bosh.py | 6 ++-- nbxmpp/c14n.py | 2 +- nbxmpp/client_nb.py | 8 ++-- nbxmpp/dispatcher_nb.py | 30 +++++++++++---------- nbxmpp/features_nb.py | 2 +- nbxmpp/idlequeue.py | 16 +++++----- nbxmpp/protocol.py | 12 +++----- nbxmpp/proxy_connectors.py | 2 +- nbxmpp/roster_nb.py | 4 +- nbxmpp/simplexml.py | 10 +++--- nbxmpp/smacks.py | 4 +- nbxmpp/stringprepare.py | 6 ++-- nbxmpp/tls_nb.py | 64 +++++++++++++++++++++++----------------------- nbxmpp/transports_nb.py | 28 ++++++++++---------- 16 files changed, 115 insertions(+), 115 deletions(-)
diffs (truncated from 740 to 300 lines):
diff -r b339386c6111 -r 5c97346d371c nbxmpp/__init__.py --- a/nbxmpp/__init__.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/__init__.py Wed Jan 02 13:17:03 2013 +0100 @@ -10,9 +10,9 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """
-from protocol import * -import simplexml, protocol, auth_nb, transports_nb, roster_nb -import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors -from client_nb import NonBlockingClient -from plugin import PlugIn -from smacks import Smacks +from .protocol import * +from . import simplexml, protocol, auth_nb, transports_nb, roster_nb +from . import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors +from .client_nb import NonBlockingClient +from .plugin import PlugIn +from .smacks import Smacks diff -r b339386c6111 -r 5c97346d371c nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/auth_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -21,15 +21,15 @@ See client_nb.py """
-from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH -from protocol import NS_STREAM_MGMT -from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from plugin import PlugIn -from smacks import Smacks +from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH +from .protocol import NS_STREAM_MGMT +from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID +from .plugin import PlugIn +from .smacks import Smacks import base64 import random import itertools -import dispatcher_nb +from . import dispatcher_nb import hashlib import hmac import hashlib @@ -218,7 +218,7 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - sasl_data = u'%s@%s' % (self.username, self._owner.Server) + sasl_data = '%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, @@ -241,7 +241,7 @@ self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed - except kerberos.GSSError, e: + except kerberos.GSSError as e: log.info('GSSAPI authentication failed: %s' % str(e)) if 'SCRAM-SHA-1' in self.mecs: self.mecs.remove('SCRAM-SHA-1') @@ -486,19 +486,19 @@ self.resp['nc'], self.resp['cnonce'], self.resp['qop'], HH(A2)])) self.resp['response'] = response - sasl_data = u'' + sasl_data = '' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ('nc', 'qop', 'response', 'charset'): - sasl_data += u"%s=%s," % (key, self.resp[key]) + sasl_data += "%s=%s," % (key, self.resp[key]) else: - sasl_data += u'%s="%s",' % (key, self.resp[key]) + sasl_data += '%s="%s",' % (key, self.resp[key]) sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( '\r', '').replace('\n', '') node = Node('response', attrs={'xmlns': NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'\x00%s\x00%s' % (self.username, self.password) + sasl_data = '\x00%s\x00%s' % (self.username, self.password) sasl_data = sasl_data.encode('utf-8').encode('base64').replace( '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, diff -r b339386c6111 -r 5c97346d371c nbxmpp/bosh.py --- a/nbxmpp/bosh.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/bosh.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,11 +20,11 @@
import locale, random from hashlib import sha1 -from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ +from .transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS -from protocol import BOSHBody, Protocol, NS_CLIENT -from simplexml import Node +from .protocol import BOSHBody, Protocol, NS_CLIENT +from .simplexml import Node
import logging log = logging.getLogger('nbxmpp.bosh') diff -r b339386c6111 -r 5c97346d371c nbxmpp/c14n.py --- a/nbxmpp/c14n.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/c14n.py Wed Jan 02 13:17:03 2013 +0100 @@ -22,7 +22,7 @@ XML canonicalisation methods (for XEP-0116) """
-from simplexml import ustr +from .simplexml import ustr
def c14n(node, is_buggy): s = "<" + node.name diff -r b339386c6111 -r 5c97346d371c nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/client_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -21,8 +21,8 @@ """
import socket -import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh -from protocol import NS_TLS +from . import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh +from .protocol import NS_TLS
import logging log = logging.getLogger('nbxmpp.client_nb') @@ -249,9 +249,9 @@ try: self.ip_addresses = socket.getaddrinfo(hostname, port, socket.AF_UNSPEC, socket.SOCK_STREAM) - except socket.gaierror, (errnum, errstr): + except socket.gaierror as exc: self.disconnect(message='Lookup failure for %s:%s, hostname: %s - %s' % - (self.Server, self.Port, hostname, errstr)) + (self.Server, self.Port, hostname, str(exc))) else: on_success()
diff -r b339386c6111 -r 5c97346d371c nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/dispatcher_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,11 +20,13 @@ different handlers to different XMPP stanzas and namespaces """
-import simplexml, sys, locale +from . import simplexml +import sys +import locale import re from xml.parsers.expat import ExpatError -from plugin import PlugIn -from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, +from .plugin import PlugIn +from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -95,17 +97,17 @@ self.sm = None
# \ufddo -> \ufdef range - c = u'\ufdd0' + c = '\ufdd0' r = c.encode('utf8') - while (c < u'\ufdef'): + while (c < '\ufdef'): c = unichr(ord(c) + 1) r += '|' + c.encode('utf8')
# \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff - c = u'\ufffe' + c = '\ufffe' r += '|' + c.encode('utf8') r += '|' + unichr(ord(c) + 1).encode('utf8') - while (c < u'\U0010fffe'): + while (c < '\U0010fffe'): c = unichr(ord(c) + 0x10000) r += '|' + c.encode('utf8') r += '|' + unichr(ord(c) + 1).encode('utf8') @@ -198,7 +200,7 @@ % (tag, ns))
def replace_non_character(self, data): - return re.sub(self.invalid_chars_re, u'\ufffd'.encode('utf-8'), data) + return re.sub(self.invalid_chars_re, '\ufffd'.encode('utf-8'), data)
def ProcessNonBlocking(self, data): """ @@ -220,7 +222,7 @@ handler(self) if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException[0], _pendingException[1], _pendingException[2] + raise _pendingException try: self.Stream.Parse(data) # end stream:stream tag received @@ -231,13 +233,13 @@ log.error('Invalid XML received from server. Forcing disconnect.') self._owner.Connection.disconnect() return 0 - except ValueError, e: + except ValueError as e: log.debug('ValueError: %s' % str(e)) self._owner.Connection.pollend() return 0 if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException[0], _pendingException[1], _pendingException[2] + raise _pendingException if len(data) == 0: return '0' return len(data) @@ -474,7 +476,7 @@ (cb, args)) try: cb(session,stanza,**args) - except Exception, typ: + except Exception as typ: if typ.__class__.__name__ != 'NodeProcessed': raise else: @@ -486,7 +488,7 @@ if user or handler['system']: try: handler['func'](session, stanza) - except Exception, typ: + except Exception as typ: if typ.__class__.__name__ != 'NodeProcessed': self._pendingExceptions.insert(0, sys.exc_info()) return @@ -552,7 +554,7 @@ sure stanzas get ID and from tag. """ ID = None - if type(stanza) not in [type(''), type(u'')]: + if type(stanza) != str: if isinstance(stanza, Protocol): ID = stanza.getID() if ID is None: diff -r b339386c6111 -r 5c97346d371c nbxmpp/features_nb.py --- a/nbxmpp/features_nb.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/features_nb.py Wed Jan 02 13:17:03 2013 +0100 @@ -20,7 +20,7 @@ (Registration, Privacy Lists, ...) """
-from protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node +from .protocol import NS_REGISTER, NS_PRIVACY, NS_DATA, Iq, isResultNode, Node
def _on_default_response(disp, iq, cb): def _on_response(resp): diff -r b339386c6111 -r 5c97346d371c nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/idlequeue.py Wed Jan 02 13:17:03 2013 +0100 @@ -25,7 +25,7 @@
# needed for get_idleqeue try: - import gobject + from gi.repository import GObject HAVE_GOBJECT = True except ImportError: HAVE_GOBJECT = False @@ -190,7 +190,7 @@ def pollin(self): try: res = self.pipe.read() - except Exception, e: + except Exception as e: res = '' if res == '': return self.pollend() @@ -424,7 +424,7 @@ return True try: waiting_descriptors = self.selector.poll(0) - except select.error, e: + except select.error as e: waiting_descriptors = [] if e[0] != 4: # interrupt raise @@ -480,7 +480,7 @@ try: waiting_descriptors = select.select(self.read_fds.keys(), self.write_fds.keys(), self.error_fds.keys(), 0) - except select.error, e: + except select.error as e: waiting_descriptors = ((), (), ()) if e[0] != 4: # interrupt raise @@ -517,15 +517,15 @@ self.events = {} # time() is already called in glib, we just get the last value # overrides IdleQueue.current_time()