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

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index fa1f669..2c97b9f 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -1,5 +1,5 @@
 import sys, traceback
-import env, req, proto
+from . import env, req, proto
 
 __all__ = ["restart"]
 
@@ -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
+    from . 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,11 +36,11 @@ def handle(req, startreq, handler):
         resp = [""]
         while True:
             try:
-                resp = iterproxy(handler(req))
+                resp = handler(req)
                 break
-            except restart, i:
+            except restart as i:
                 handler = i.handle
-            except Exception, i:
+            except Exception as i:
                 if eh is None:
                     raise
                 handler = wraphandler(eh, sys.exc_info())
@@ -79,3 +55,15 @@ def handleenv(env, startreq, handler):
         return proto.simpleerror(env, startreq, 400, "Bad Request", "Request must include Host header.")
     r = req.origrequest(env)
     return handle(r, startreq, handler)
+
+def exterror(env, startreq):
+    def handler(req):
+        from . import resp
+        code = 404
+        if "Response-Code" in req.ihead:
+            try:
+                code = int(req.ihead["Response-Code"])
+            except ValueError:
+                pass
+        raise resp.httperror(code)
+    return handleenv(env, startreq, handler)