X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=5276892ac9e1abbc8250a92f07d78cdc0722e052;hb=784495582d53f5b759dd216ddd1268fbe2479bb9;hp=4d22b72836550b75be305b2927b3311327c4b66a;hpb=77dd732a3b3b604a6029e748ffd4fb0b9760642d;p=wrw.git

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index 4d22b72..5276892 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -1,5 +1,5 @@
 import sys, traceback
-import env, req, proto
+from . import env, req, proto
 
 __all__ = ["restart"]
 
@@ -17,13 +17,14 @@ def mangle(result):
     return [str(result)]
 
 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)
+    wrapped.__wrapped__ = handler
     return wrapped
 
 errorhandler = env.var(defaulterror)
@@ -36,9 +37,9 @@ def handle(req, startreq, handler):
             try:
                 resp = 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())