From e8aa9ce29141768796b430fa8c6f95dce6e7a507 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Wed, 21 Dec 2011 06:35:45 +0100 Subject: [PATCH] Proxy the response iter to make generator code run before return. --- wrw/dispatch.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/wrw/dispatch.py b/wrw/dispatch.py index 5a7bda0..fe62df3 100644 --- a/wrw/dispatch.py +++ b/wrw/dispatch.py @@ -13,12 +13,38 @@ def mangle(result): return result return [str(result)] +class iterproxy(object): + # Makes sure iter(real).next() is called immediately, in order to + # let generator code run. + def __init__(self, real): + self.bk = real + self.bki = iter(real) + self._next = [None] + self.next() + + def __iter__(self): + return self + + def next(self): + if self._next is None: + raise StopIteration() + ret = self._next[0] + try: + self._next[:] = [self.bki.next()] + except StopIteration: + self._next = None + return ret + + def close(self): + if hasattr(self.bk, "close"): + self.bk.close() + def handle(req, startreq, handler): try: resp = [""] while True: try: - resp = handler(req) + resp = iterproxy(handler(req)) break except restart, i: handler = i.handle -- 2.11.0