Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
dispatch.py
diff --git
a/wrw/dispatch.py
b/wrw/dispatch.py
index
15ea99e
..
5276892
100644
(file)
--- a/
wrw/dispatch.py
+++ b/
wrw/dispatch.py
@@
-1,5
+1,5
@@
import sys, traceback
import sys, traceback
-import env
+from . import env, req, proto
__all__ = ["restart"]
__all__ = ["restart"]
@@
-16,40
+16,15
@@
def mangle(result):
return result
return [str(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):
def defaulterror(req, excinfo):
- import resp
+
from .
import resp
traceback.print_exception(*excinfo)
raise resp.httperror(500)
def wraphandler(handler, excinfo):
def wrapped(req):
return handler(req, excinfo)
traceback.print_exception(*excinfo)
raise resp.httperror(500)
def wraphandler(handler, excinfo):
def wrapped(req):
return handler(req, excinfo)
+ wrapped.__wrapped__ = handler
return wrapped
errorhandler = env.var(defaulterror)
return wrapped
errorhandler = env.var(defaulterror)
@@
-60,11
+35,11
@@
def handle(req, startreq, handler):
resp = [""]
while True:
try:
resp = [""]
while True:
try:
- resp =
iterproxy(handler(req)
)
+ resp =
handler(req
)
break
break
- except restart
,
i:
+ except restart
as
i:
handler = i.handle
handler = i.handle
- except Exception
,
i:
+ except Exception
as
i:
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())
@@
-73,3
+48,9
@@
def handle(req, startreq, handler):
return resp
finally:
req.cleanup()
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)