X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=10cc2f6ef8014d451e330ebdf9119eee00bf3627;hb=10ba659d32518d2d09b12ada86a380798b378fe7;hp=15ea99e8c537e74c77006d7ea052f32ebc5b859a;hpb=784d41f352527072fd9e26488f79e163868619b9;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index 15ea99e..10cc2f6 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -1,5 +1,5 @@
 import sys, traceback
-import env
+from . import env, req, proto
 
 __all__ = ["restart"]
 
@@ -23,17 +23,17 @@ class iterproxy(object):
         self.bk = real
         self.bki = iter(real)
         self._next = [None]
-        self.next()
+        self.__next__()
 
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         if self._next is None:
             raise StopIteration()
         ret = self._next[0]
         try:
-            self._next[:] = [self.bki.next()]
+            self._next[:] = [self.bki.__next__()]
         except StopIteration:
             self._next = None
         return ret
@@ -43,7 +43,7 @@ class iterproxy(object):
             self.bk.close()
 
 def defaulterror(req, excinfo):
-    import resp
+    from . import resp
     traceback.print_exception(*excinfo)
     raise resp.httperror(500)
 
@@ -62,9 +62,9 @@ def handle(req, startreq, handler):
             try:
                 resp = iterproxy(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())
@@ -73,3 +73,9 @@ 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)