From 62710e906a668b571cd9e62c3862c074faab0be1 Mon Sep 17 00:00:00 2001 From: Alexander Cherniuk <ts33kr@gmail.com> Date: Wed, 9 Jun 2010 23:13:17 +0300 Subject: [PATCH] Corrected exception handling. We really should bump to Python 2.6. Fixes #5778 --- src/common/xmpp/transports_nb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py index 0c9a49966f..2b0a57c9de 100644 --- a/src/common/xmpp/transports_nb.py +++ b/src/common/xmpp/transports_nb.py @@ -351,8 +351,8 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): try: self._sock.setblocking(False) self._sock.connect((self.server, self.port)) - except Exception, (errnum, errstr): - pass + except Exception, exc: + errnum, errstr = exc.args if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress -- GitLab