diff options
| author | Brian Beggs <macdiesel@gmail.com> | 2010-06-02 07:32:33 -0400 |
|---|---|---|
| committer | Brian Beggs <macdiesel@gmail.com> | 2010-06-02 07:32:33 -0400 |
| commit | 686943a2ec3c97e4e39ee2e38d9fd571ed98dd35 (patch) | |
| tree | f8a9b69630792567ddae16ce0627ee2c2b1c6caa /sleekxmpp/xmlstream/handler | |
| parent | dda3e733b59a9e71482538898a807623a79f0dbf (diff) | |
| parent | 4eb210bff5753143300e5bf6ae09617901e9a28e (diff) | |
| download | slixmpp-686943a2ec3c97e4e39ee2e38d9fd571ed98dd35.tar.gz slixmpp-686943a2ec3c97e4e39ee2e38d9fd571ed98dd35.tar.bz2 slixmpp-686943a2ec3c97e4e39ee2e38d9fd571ed98dd35.tar.xz slixmpp-686943a2ec3c97e4e39ee2e38d9fd571ed98dd35.zip | |
Merge remote branch 'tom/hacks'
Diffstat (limited to 'sleekxmpp/xmlstream/handler')
| -rw-r--r-- | sleekxmpp/xmlstream/handler/base.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/handler/callback.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/handler/base.py b/sleekxmpp/xmlstream/handler/base.py index 5d55f4ee..a44edf0e 100644 --- a/sleekxmpp/xmlstream/handler/base.py +++ b/sleekxmpp/xmlstream/handler/base.py @@ -18,7 +18,7 @@ class BaseHandler(object): def match(self, xml): return self._matcher.match(xml) - def prerun(self, payload): + def prerun(self, payload): # what's the point of this if the payload is called again in run?? self._payload = payload def run(self, payload): diff --git a/sleekxmpp/xmlstream/handler/callback.py b/sleekxmpp/xmlstream/handler/callback.py index 49cfa14d..ea5acb5b 100644 --- a/sleekxmpp/xmlstream/handler/callback.py +++ b/sleekxmpp/xmlstream/handler/callback.py @@ -17,13 +17,15 @@ class Callback(base.BaseHandler): self._once = once self._instream = instream - def prerun(self, payload): + def prerun(self, payload): # prerun actually calls run?!? WTF! Then it gets run AGAIN! base.BaseHandler.prerun(self, payload) if self._instream: + logging.debug('callback "%s" prerun', self.name) self.run(payload, True) def run(self, payload, instream=False): if not self._instream or instream: + logging.debug('callback "%s" run', self.name) base.BaseHandler.run(self, payload) #if self._thread: # x = threading.Thread(name="Callback_%s" % self.name, target=self._pointer, args=(payload,)) |