Made Python3 changes.

[wrw.git] / wrw / dispatch.py

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index e51559e..2c97b9f 100644 (file)
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -1,5 +1,5 @@
 import sys, traceback
-from . import env
+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):
     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,7 +36,7 @@ def handle(req, startreq, handler):
         resp = [""]
         while True:
             try:
-                resp = iterproxy(handler(req))
+                resp = handler(req)
                 break
             except restart as i:
                 handler = i.handle
@@ -73,3 +49,21 @@ def handle(req, startreq, handler):
         return resp
     finally:
         req.cleanup()
+
+def handleenv(env, startreq, handler):
+    if not "HTTP_HOST" in env:
+        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)