changeset 3dec8187531c in /home/hg/repos/python-nbxmpp

details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3dec8187531c description: initialize ssl_errnum to 0 py2 -> py3

diffstat:

nbxmpp/bosh.py | 2 +- nbxmpp/tls_nb.py | 6 +++--- nbxmpp/transports_nb.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 82883ceb3310 -r 3dec8187531c nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sat Mar 15 20:39:59 2014 +0100 +++ b/nbxmpp/bosh.py Thu Mar 27 13:22:15 2014 +0100 @@ -94,7 +94,7 @@

# ssl variables self.ssl_certificate = None - self.ssl_errnum = None + self.ssl_errnum = 0

def connect(self, conn_5tuple, on_connect, on_connect_failure): diff -r 82883ceb3310 -r 3dec8187531c nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Mar 15 20:39:59 2014 +0100 +++ b/nbxmpp/tls_nb.py Thu Mar 27 13:22:15 2014 +0100 @@ -383,10 +383,10 @@ if self.tls_version not in ('1.0', '1.1'): try: flags |= OpenSSL.SSL.OP_NO_TLSv1_1 - except AttributeError, e: + except AttributeError as e: # older py-OpenSSL flags |= 0x10000000 - except AttributeError, e: + except AttributeError as e: pass # much older py-OpenSSL

@@ -395,7 +395,7 @@ try: # Supported only pyOpenSSL >= 0.14 # Disable session resumption, protection against Triple Handshakes TLS attack tcpsock._sslContext.set_session_cache_mode(OpenSSL.SSL.SESS_CACHE_OFF) - except AttributeError, e: + except AttributeError as e: pass

# NonBlockingHTTPBOSH instance has no attribute _owner diff -r 82883ceb3310 -r 3dec8187531c nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Mar 15 20:39:59 2014 +0100 +++ b/nbxmpp/transports_nb.py Thu Mar 27 13:22:15 2014 +0100 @@ -320,7 +320,7 @@

# ssl variables self.ssl_certificate = None - self.ssl_errnum = None + self.ssl_errnum = 0

# FIXME: transport should not be aware xmpp def start_disconnect(self):