Merge branch 'master' into python3

diff --cc wrw/resp.py
index bc8f2db,24896ba..b62ce0e
--- 1/wrw/resp.py
--- 2/wrw/resp.py
+++ b/wrw/resp.py
@@@ -33,12 -33,12 +33,12 @@@ class usererror(dispatch.restart)
          self.detail = detail
  
      def handle(self, req):
-         return xhtml.forreq(req, skelfor(req).error(self.message, *self.detail))
+         return skelfor(req).error(req, self.message, *self.detail)
  
  class message(dispatch.restart):
 -    def __init__(self, msg, *detail):
 -        super(message, self).__init__()
 -        self.message = msg
 +    def __init__(self, message, *detail):
 +        super().__init__()
 +        self.message = message
          self.detail = detail
  
      def handle(self, req):