changeset f48052492c24 in /home/hg/repos/python-nbxmpp

details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f48052492c24 description: don't crash when printing errors in logs on non-utf-8 console.

diffstat:

nbxmpp/transports_nb.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 51736d2c5fd2 -r f48052492c24 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Wed Jul 02 18:04:10 2014 +0200 +++ b/nbxmpp/transports_nb.py Sat Oct 04 21:55:56 2014 +0200 @@ -37,6 +37,7 @@ import time import traceback import base64 +import locale

try: from urllib.parse import urlparse @@ -369,7 +370,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 @@ -472,7 +474,8 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - log.info('Error while disconnecting socket: %s' % str(e)) + errstr = e.strerror.decode(locale.getpreferredencoding()) + log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback)

@@ -599,7 +602,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'