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
50adc04
..
10cc2f6
100644
(file)
--- a/
wrw/dispatch.py
+++ b/
wrw/dispatch.py
@@
-1,3
+1,6
@@
+import sys, traceback
+from . import env, req, proto
+
__all__ = ["restart"]
class restart(Exception):
__all__ = ["restart"]
class restart(Exception):
@@
-20,17
+23,17
@@
class iterproxy(object):
self.bk = real
self.bki = iter(real)
self._next = [None]
self.bk = real
self.bki = iter(real)
self._next = [None]
- self.
next
()
+ self.
__next__
()
def __iter__(self):
return self
def __iter__(self):
return self
- def
next
(self):
+ def
__next__
(self):
if self._next is None:
raise StopIteration()
ret = self._next[0]
try:
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
except StopIteration:
self._next = None
return ret
@@
-39,7
+42,20
@@
class iterproxy(object):
if hasattr(self.bk, "close"):
self.bk.close()
if hasattr(self.bk, "close"):
self.bk.close()
+def defaulterror(req, excinfo):
+ from . import resp
+ traceback.print_exception(*excinfo)
+ raise resp.httperror(500)
+
+def wraphandler(handler, excinfo):
+ def wrapped(req):
+ return handler(req, excinfo)
+ return wrapped
+
+errorhandler = env.var(defaulterror)
+
def handle(req, startreq, handler):
def handle(req, startreq, handler):
+ eh = errorhandler.val
try:
resp = [""]
while True:
try:
resp = [""]
while True:
@@
-48,7
+64,18
@@
def handle(req, startreq, handler):
break
except restart as i:
handler = i.handle
break
except restart as i:
handler = i.handle
+ except Exception as i:
+ if eh is None:
+ raise
+ handler = wraphandler(eh, sys.exc_info())
+ eh = None
req.commit(startreq)
return resp
finally:
req.cleanup()
req.commit(startreq)
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)