X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=f0326cba02e7062561cbca46f6f5d021e73fe941;hb=d1e3dec2221697e7f59be8808f7eb83ffa8ab85a;hp=fa1f669d8f43099f6c41c3f919689496409cf725;hpb=7450e2fcc553f66844b34d5c062a965b8fca28c5;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index fa1f669..f0326cb 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -16,40 +16,16 @@ 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 defaulterror(req, excinfo):
     import resp
     traceback.print_exception(*excinfo)
+    sys.stderr.flush()
     raise resp.httperror(500)
 
 def wraphandler(handler, excinfo):
     def wrapped(req):
         return handler(req, excinfo)
+    wrapped.__wrapped__ = handler
     return wrapped
 
 errorhandler = env.var(defaulterror)
@@ -60,7 +36,7 @@ def handle(req, startreq, handler):
         resp = [""]
         while True:
             try:
-                resp = iterproxy(handler(req))
+                resp = handler(req)
                 break
             except restart, i:
                 handler = i.handle