-import dispatch, proto
+from . import dispatch, proto, env
__all__ = ["skeleton", "skelfor", "setskel", "usererror"]
def message(self, message, detail):
return self.page(message, """<h1>%s</h1>\n<p>%s</p>\n""" % (message, detail))
-defskel = skeleton()
+defskel = env.var(skeleton())
def getskel(req):
- return [defskel]
+ return [defskel.val]
def skelfor(req):
return req.item(getskel)[0]
def setskel(req, skel):
class usererror(dispatch.restart):
def __init__(self, message, detail):
- super(usererror, self).__init__()
+ super().__init__()
self.message = message
self.detail = detail
def handle(self, req):
- return [skelfor(req).error(self.message, self.detail)]
+ return [skelfor(req).error(self.message, self.detail).encode("utf-8")]
class message(dispatch.restart):
def __init__(self, message, detail):
- super(message, self).__init__()
+ super().__init__()
self.message = message
self.detail = detail
def handle(self, req):
- return [skelfor(req).message(self.message, self.detail)]
+ return [skelfor(req).message(self.message, self.detail).encode("utf-8")]
class httperror(usererror):
def __init__(self, status, message = None, detail = None):
message = proto.statusinfo[status][0]
if detail is None:
detail = proto.statusinfo[status][1]
- super(httperror, self).__init__(message, detail)
+ super().__init__(message, detail)
self.status = status
def handle(self, req):
req.status(self.status, self.message)
- return super(httperror, self).handle(req)
+ return super().handle(req)
class notfound(httperror):
def __init__(self):
- return super(notfound, self).__init__(404)
+ return super().__init__(404)
class redirect(dispatch.restart):
def __init__(self, url, status = 303):
- super(redirect, self).__init__()
+ super().__init__()
self.url = url
self.status = status