X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=2c97b9fbb30e0291a4fc05160fb5720ea5790b5b;hb=51a13716668cc48bf87e0d0296f8b9900fafe83b;hp=4d22b72836550b75be305b2927b3311327c4b66a;hpb=77dd732a3b3b604a6029e748ffd4fb0b9760642d;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index 4d22b72..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"]
 
@@ -17,13 +17,15 @@ def mangle(result):
     return [str(result)]
 
 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)
@@ -36,9 +38,9 @@ def handle(req, startreq, handler):
             try:
                 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())
@@ -53,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)