diff options
| -rw-r--r-- | sleekxmpp/xmlstream/handler/base.py | 12 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/handler/waiter.py | 14 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/sleekxmpp/xmlstream/handler/base.py b/sleekxmpp/xmlstream/handler/base.py index 3ae82a89..9c704ec6 100644 --- a/sleekxmpp/xmlstream/handler/base.py +++ b/sleekxmpp/xmlstream/handler/base.py @@ -25,10 +25,10 @@ class BaseHandler(object): stream -- The stream this handler is assigned to. Methods: - match -- Compare a stanza with the handler's matcher. - prerun -- Handler execution during stream processing. - run -- Handler execution during the main event loop. - checkDelete -- Indicate if the handler may be removed from use. + match -- Compare a stanza with the handler's matcher. + prerun -- Handler execution during stream processing. + run -- Handler execution during the main event loop. + check_delete -- Indicate if the handler may be removed from use. """ def __init__(self, name, matcher, stream=None): @@ -42,6 +42,8 @@ class BaseHandler(object): this handler. stream -- The XMLStream instance the handler should monitor. """ + self.checkDelete = self.check_delete + self.name = name self.stream = stream self._destroy = False @@ -79,7 +81,7 @@ class BaseHandler(object): """ self._payload = payload - def checkDelete(self): + def check_delete(self): """ Check if the handler should be removed from the list of stream handlers. diff --git a/sleekxmpp/xmlstream/handler/waiter.py b/sleekxmpp/xmlstream/handler/waiter.py index 1e101ed3..80720226 100644 --- a/sleekxmpp/xmlstream/handler/waiter.py +++ b/sleekxmpp/xmlstream/handler/waiter.py @@ -25,11 +25,11 @@ class Waiter(BaseHandler): waiter has timed out. Methods: - checkDelete -- Overrides BaseHandler.checkDelete - prerun -- Overrides BaseHandler.prerun - run -- Overrides BaseHandler.run - wait -- Wait for a stanza to arrive and return it to - an event handler. + check_delete -- Overrides BaseHandler.check_delete + prerun -- Overrides BaseHandler.prerun + run -- Overrides BaseHandler.run + wait -- Wait for a stanza to arrive and return it to + an event handler. """ def __init__(self, name, matcher, stream=None): @@ -89,10 +89,10 @@ class Waiter(BaseHandler): self.stream.removeHandler(self.name) return stanza - def checkDelete(self): + def check_delete(self): """ Always remove waiters after use. - Overrides BaseHandler.checkDelete + Overrides BaseHandler.check_delete """ return True diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 4c3dd9fe..5fd7be9d 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -755,7 +755,7 @@ class XMLStream(object): handler.prerun(stanza_copy) self.event_queue.put(('stanza', handler, stanza_copy)) try: - if handler.checkDelete(): + if handler.check_delete(): self.__handlers.pop(self.__handlers.index(handler)) except: pass # not thread safe |