X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=50adc040d8e85dc0f0c90d4ed98148651b21f3d9;hb=d13a1a574515e4c4a40ed0090c8c684cc9e523f2;hp=d428a77ce5f503ae871b3e8eb8d2f2874d22544c;hpb=b409a33843abb3221edd27016558c39cf33a6510;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index d428a77..50adc04 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -13,15 +13,41 @@ 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
+            except restart as i:
+                handler = i.handle
         req.commit(startreq)
         return resp
     finally: