diff options
| author | Tom Nichols <tmnichols@gmail.com> | 2010-06-02 15:45:51 -0400 |
|---|---|---|
| committer | Tom Nichols <tmnichols@gmail.com> | 2010-06-02 15:45:51 -0400 |
| commit | 77bff9cce7deff133017c3aa2c36ff121adfd544 (patch) | |
| tree | 4eed9803932e32dd6e691b9dc2c6dc8b081dbb01 /sleekxmpp/xmlstream/handler | |
| parent | 3f41fdd231998aeb68a7490f723d3c092bd7e380 (diff) | |
| parent | 7930ed22f2371ba3405f9644f427bec9554d2a15 (diff) | |
| download | slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.gz slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.bz2 slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.tar.xz slixmpp-77bff9cce7deff133017c3aa2c36ff121adfd544.zip | |
Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into 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,)) |