summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-06 14:06:02 -0400
committerLance Stout <lancestout@gmail.com>2010-10-06 14:06:02 -0400
commitd0ccbf6b7a1b79a5497a3108fcda8c6e9fe405ed (patch)
tree9f29da4ae804bf2687c6e9181bb0679a3fb30168 /sleekxmpp/xmlstream/xmlstream.py
parente1866ab3287ef184bbbbb4b0a7da33b4c0f6791a (diff)
parent3ffa09ba7c7c1d7806b02a5711c8f6e9eb9b1500 (diff)
downloadslixmpp-d0ccbf6b7a1b79a5497a3108fcda8c6e9fe405ed.tar.gz
slixmpp-d0ccbf6b7a1b79a5497a3108fcda8c6e9fe405ed.tar.bz2
slixmpp-d0ccbf6b7a1b79a5497a3108fcda8c6e9fe405ed.tar.xz
slixmpp-d0ccbf6b7a1b79a5497a3108fcda8c6e9fe405ed.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 239eab8f..b7382c82 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -493,7 +493,10 @@ class XMLStream(object):
# processed in the queue.
with self.__event_handlers_lock:
handler_index = self.__event_handlers[name].index(handler)
- self.__event_handlers[name].pop(handler_index)
+ try:
+ self.__event_handlers[name].pop(handler_index)
+ except:
+ pass
def schedule(self, name, seconds, callback, args=None,
kwargs=None, repeat=False):