changeset 7bd1e7d1b1a2 in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7bd1e7d1b1a2 description: fix decoding traceback error
diffstat:
nbxmpp/transports_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
diffs (40 lines):
diff -r cce4e2196327 -r 7bd1e7d1b1a2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 31 15:17:54 2015 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 28 21:49:49 2015 +0100 @@ -38,6 +38,7 @@ import traceback import base64 import sys +import locale
try: from urllib.parse import urlparse @@ -370,7 +371,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno, exc.strerror + errnum, errstr = exc.errno,\ + exc.strerror.decode(locale.getpreferredencoding())
if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -473,7 +475,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror + errstr = e.strerror.decode(locale.getpreferredencoding()) log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -601,7 +603,8 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, e.strerror + errnum, errstr = e.errno, + e.strerror.decode(locale.getpreferredencoding())
if received == '': errstr = 'zero bytes on recv'