copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[pyopenssl] Yet more exception fixes

This commit is contained in:
junglecow 2006-12-01 22:23:45 +00:00
parent 236ed0463a
commit 4a58bc4797
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/xmpp/transports_nb.py
View File

@ -79,14 +79,19 @@ class SSLWrapper:
def __init__(this, sock=None, exc=None, errno=None, strerror=None, peer=None): def __init__(this, sock=None, exc=None, errno=None, strerror=None, peer=None):
this.parent = IOError this.parent = IOError
errno = errno or gattr(exc, 'errno', 0)
strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args')
if not isinstance(strerror, basestring): strerror = repr(strerror)
this.parent.__init__(this, errno, strerror)
this.sock = sock
this.exc = exc this.exc = exc
errno = errno or gattr(this.exc, 'errno', 0)
strerror = strerror or gattr(this.exc, 'strerror') or gattr(this.exc, 'args')
this.parent.__init__(this, this.errno, this.strerror)
this.peer = peer this.peer = peer
this.exc_name = None this.exc_name = None
this.exc_args = None
this.exc_str = None
this.exc_repr = None
if this.exc is not None: if this.exc is not None:
this.exc_name = str(this.exc.__class__) this.exc_name = str(this.exc.__class__)
@ -96,7 +101,7 @@ class SSLWrapper:
if this.peer is None and sock is not None: if this.peer is None and sock is not None:
try: try:
ppeer = this.obj.getpeername() ppeer = this.sock.getpeername()
if len(ppeer) == 2 and isinstance(ppeer[0], basestring) \ if len(ppeer) == 2 and isinstance(ppeer[0], basestring) \
and isinstance(ppeer[1], int): and isinstance(ppeer[1], int):
this.peer = ppeer this.peer = ppeer
@ -104,7 +109,7 @@ class SSLWrapper:
def __str__(this): def __str__(this):
s = str(this.__class__) s = str(this.__class__)
if this.peer: s += "for %s:%d" % this.peer if this.peer: s += " for %s:%d" % this.peer
if this.errno is not None: s += ": [Errno: %d]" % this.errno if this.errno is not None: s += ": [Errno: %d]" % this.errno
if this.strerror: s += " (%s)" % this.strerror if this.strerror: s += " (%s)" % this.strerror
if this.exc_name: if this.exc_name: