From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 5 Jul 2012 00:24:58 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=09dd8abaebe7bee21670535ae04ec37f0fa644ab

Merge branch 'master' into python3
---

09dd8abaebe7bee21670535ae04ec37f0fa644ab
diff --cc wrw/resp.py
index bc8f2db,24896ba..b62ce0e
--- a/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):