python-nbxmpp: stop using decode string method in py3

changeset 6f86fbe3f1a2 in /home/hg/repos/python-nbxmpp

details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=6f86fbe3f1a2 description: stop using decode string method in py3

diffstat:

nbxmpp/transports_nb.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 9cbf8b322d8b -r 6f86fbe3f1a2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Jun 14 14:32:21 2015 +0200 +++ b/nbxmpp/transports_nb.py Sun Jun 14 10:38:49 2015 -0400 @@ -84,6 +84,13 @@ proxy_user, proxy_pass = proxy['user'], proxy['pass'] return tcp_host, tcp_port, proxy_user, proxy_pass

+def decode_py2(string, encoding): + # decodes string into unicode if in py2 + # py3 has unicode strings by default + if sys.version_info[0] < 3: + return string.decode(encoding) + return string + #: timeout to connect to the server socket, it doesn't include auth CONNECT_TIMEOUT_SECONDS = 30

@@ -371,8 +378,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno,\ - exc.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = exc.errno, \ + decode_py2(exc.strerror, locale.getpreferredencoding())

if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress