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

Removing all calls to sys.exc_clear(). This is only necessary in very rare circumstances, and if there is such a circumstance, it should be clearly documented in code.

Browse source
This commit is contained in:
junglecow 2006-11-13 15:07:47 +00:00
parent 9e3e14dd78
commit 4617618463
4 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/xmpp/dispatcher_nb.py
View file

@ -135,7 +135,6 @@ class Dispatcher(PlugIn):
self._owner.Connection.disconnect() self._owner.Connection.disconnect()
return 0 return 0
except ExpatError: except ExpatError:
sys.exc_clear()
self.DEBUG('Invalid XML received from server. Forcing disconnect.', 'error') self.DEBUG('Invalid XML received from server. Forcing disconnect.', 'error')
self._owner.Connection.pollend() self._owner.Connection.pollend()
return 0 return 0

4
src/common/xmpp/transports_nb.py
View file

@ -249,7 +249,6 @@ class NonBlockingTcp(PlugIn, IdleObject):
self._sock.setblocking(False) self._sock.setblocking(False)
except: except:
traceback.print_exc() traceback.print_exc()
sys.exc_clear()
if self.on_connect_failure: if self.on_connect_failure:
self.on_connect_failure() self.on_connect_failure()
return False return False
@ -303,7 +302,6 @@ class NonBlockingTcp(PlugIn, IdleObject):
except: except:
traceback.print_exc() traceback.print_exc()
# socket is already closed # socket is already closed
sys.exc_clear()
# socket descriptor cannot be (un)plugged anymore # socket descriptor cannot be (un)plugged anymore
self.fd = -1 self.fd = -1
if self.on_disconnect: if self.on_disconnect:
@ -432,7 +430,6 @@ class NonBlockingTcp(PlugIn, IdleObject):
self._on_send() self._on_send()
except socket.error, e: except socket.error, e:
traceback.print_exc() traceback.print_exc()
sys.exc_clear()
if e[0] == socket.SSL_ERROR_WANT_WRITE: if e[0] == socket.SSL_ERROR_WANT_WRITE:
return True return True
if self.state < 0: if self.state < 0:
@ -453,7 +450,6 @@ class NonBlockingTcp(PlugIn, IdleObject):
except socket.error, e: except socket.error, e:
traceback.print_exc() traceback.print_exc()
errnum = e[0] errnum = e[0]
sys.exc_clear()
# in progress, or would block # in progress, or would block
if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK):
return return

2
src/common/zeroconf/client_zeroconf.py
View file

@ -377,7 +377,6 @@ class P2PConnection(IdleObject, PlugIn):
except Exception, e: except Exception, e:
if len(e.args) > 0 and isinstance(e.args[0], int): if len(e.args) > 0 and isinstance(e.args[0], int):
errnum = e[0] errnum = e[0]
sys.exc_clear()
# "received" will be empty anyhow # "received" will be empty anyhow
if errnum == socket.SSL_ERROR_WANT_READ: if errnum == socket.SSL_ERROR_WANT_READ:
pass pass
@ -457,7 +456,6 @@ class P2PConnection(IdleObject, PlugIn):
self._on_send() self._on_send()
except socket.error, e: except socket.error, e:
sys.exc_clear()
if e[0] == socket.SSL_ERROR_WANT_WRITE: if e[0] == socket.SSL_ERROR_WANT_WRITE:
return True return True
if self.state < 0: if self.state < 0:

1
src/gajim-remote.py
View file

@ -27,7 +27,6 @@ from common import i18n
try: try:
PREFERRED_ENCODING = locale.getpreferredencoding() PREFERRED_ENCODING = locale.getpreferredencoding()
except: except:
sys.exc_clear()
PREFERRED_ENCODING = 'UTF-8' PREFERRED_ENCODING = 'UTF-8'
def send_error(error_message): def send_error(error_message):