Merge branch 'master' into python3

Conflicts:
	wrw/resp.py
	wrw/session.py

diff --cc wrw/dispatch.py
index 709cfe4,15ea99e..e51559e
--- 1/wrw/dispatch.py
--- 2/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@@ -1,3 -1,6 +1,6 @@@
 -import env
+ import sys, traceback
++from . import env
+ 
  __all__ = ["restart"]
  
  class restart(Exception):
@@@ -39,15 -42,33 +42,33 @@@ class iterproxy(object)
          if hasattr(self.bk, "close"):
              self.bk.close()
  
 -    import resp
+ 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):
+     eh = errorhandler.val
      try:
          resp = [""]
          while True:
              try:
                  resp = iterproxy(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())
+                 eh = None
          req.commit(startreq)
          return resp
      finally:

diff --cc wrw/resp.py
index 75a7f3a,3514616..6e95ec5
--- 1/wrw/resp.py
--- 2/wrw/resp.py
+++ b/wrw/resp.py
@@@ -1,4 -1,4 +1,4 @@@
- from . import dispatch, proto
 -import dispatch, proto, env
++from . import dispatch, proto, env
  
  __all__ = ["skeleton", "skelfor", "setskel", "usererror"]
  

diff --cc wrw/session.py
index d78c43b,1239ecd..832387e
--- 1/wrw/session.py
--- 2/wrw/session.py
+++ b/wrw/session.py
@@@ -1,5 -1,5 +1,5 @@@
  import threading, time, pickle, random, os
- from . import cookie
 -import cookie, env
++from . import cookie, env
  
  __all__ = ["db", "get"]
  

diff --cc wrw/util.py
Simple merge