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 python2
[wrw.git]
/
wrw
/
dispatch.py
diff --git
a/wrw/dispatch.py
b/wrw/dispatch.py
index
2c97b9f
..
666d7a7
100644
(file)
--- a/
wrw/dispatch.py
+++ b/
wrw/dispatch.py
@@
-1,5
+1,5
@@
import sys, traceback
import sys, traceback
-
from .
import env, req, proto
+import env, req, proto
__all__ = ["restart"]
__all__ = ["restart"]
@@
-17,7
+17,7
@@
def mangle(result):
return [str(result)]
def defaulterror(req, excinfo):
return [str(result)]
def defaulterror(req, excinfo):
-
from .
import resp
+ import resp
traceback.print_exception(*excinfo)
sys.stderr.flush()
raise resp.httperror(500)
traceback.print_exception(*excinfo)
sys.stderr.flush()
raise resp.httperror(500)
@@
-38,9
+38,9
@@
def handle(req, startreq, handler):
try:
resp = handler(req)
break
try:
resp = handler(req)
break
- except restart
as
i:
+ except restart
,
i:
handler = i.handle
handler = i.handle
- except Exception
as
i:
+ except Exception
,
i:
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())
@@
-58,7
+58,7
@@
def handleenv(env, startreq, handler):
def exterror(env, startreq):
def handler(req):
def exterror(env, startreq):
def handler(req):
-
from .
import resp
+ import resp
code = 404
if "Response-Code" in req.ihead:
try:
code = 404
if "Response-Code" in req.ihead:
try: