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 'python3' of git.dolda2000.com:/srv/git/r/wrw into python3
[wrw.git]
/
wrw
/
dispatch.py
diff --git
a/wrw/dispatch.py
b/wrw/dispatch.py
index
1dedbe6
..
5276892
100644
(file)
--- a/
wrw/dispatch.py
+++ b/
wrw/dispatch.py
@@
-1,5
+1,5
@@
import sys, traceback
import sys, traceback
-import env, req, proto
+
from .
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):
- import resp
+
from .
import resp
traceback.print_exception(*excinfo)
raise resp.httperror(500)
traceback.print_exception(*excinfo)
raise resp.httperror(500)
@@
-37,9
+37,9
@@
def handle(req, startreq, handler):
try:
resp = handler(req)
break
try:
resp = handler(req)
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())