X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=709cfe4e18dedad2921de5e7390e4a601c313f29;hb=ca6fd155fd1cf58241c9d136977c2fd08948b51b;hp=b6009af680a3ed302c5a5b201ec7882ca35ac7fb;hpb=c33f2d6c068bf96c56e8e6966340f5f6e448df96;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index b6009af..709cfe4 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 as i:
                 handler = i.handle