-import dispatch, proto, env
-from sp import xhtml
+from . import dispatch, proto, env
+from .sp import xhtml
h = xhtml.cons()
__all__ = ["skeleton", "skelfor", "setskel", "usererror"]
class skeleton(object):
- def page(self, title, *content):
- return h.html(self.head(title), h.body(*content))
+ def page(self, req, title, *content):
+ return xhtml.forreq(req, h.html(self.head(req, title), h.body(*content)))
- def head(self, title):
+ def head(self, req, title):
return xhtml.head(title=title)
- def error(self, message, *detail):
- return self.page(message, h.h1(message), h.p(*detail))
+ def error(self, req, message, *detail):
+ return self.page(req, message, h.h1(message), h.p(*detail))
- def message(self, message, *detail):
- return self.page(message, h.h1(message), h.p(*detail))
+ def message(self, req, message, *detail):
+ return self.page(req, message, h.h1(message), h.p(*detail))
defskel = env.var(skeleton())
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 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):
- return xhtml.forreq(req, skelfor(req).error(self.message, *self.detail))
+ return skelfor(req).error(req, self.message, *self.detail)
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
req.status(self.status, "Redirect")
req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
return []
+
+class unmodified(dispatch.restart):
+ def handle(self, req):
+ req.status(304, "Not Modified")
+ req.ohead["Content-Length"] = "0"
+ return []