X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fresp.py;h=bdceb90778ac370a855292c6f6e9e08322de761d;hb=3b67497cb853ea7dd49f579566e5f0b60a3c97d7;hp=75a7f3a5cd64d9addc84a5414dc10febd3d809db;hpb=f9e9a7b5b192adfc7318e7f3ba0153668eef3bc1;p=wrw.git diff --git a/wrw/resp.py b/wrw/resp.py index 75a7f3a..bdceb90 100644 --- a/wrw/resp.py +++ b/wrw/resp.py @@ -1,66 +1,56 @@ -from . import dispatch, proto +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 """ - - - -%s - - -%s - -""" % (self.head(title), content) + def page(self, req, title, *content): + return xhtml.forreq(req, h.html(self.head(req, title), h.body(*content))) - def head(self, title): - return """%s\n%s""" % (title, self.style()) + def head(self, req, title): + return xhtml.head(title=title) - def style(self): - return "" + def error(self, req, message, *detail): + return self.page(req, message, h.h1(message), h.p(*detail)) - def error(self, message, detail): - return self.page(message, """

%s

\n

%s

\n""" % (message, detail)) + def message(self, req, message, *detail): + return self.page(req, message, h.h1(message), h.p(*detail)) - def message(self, message, detail): - return self.page(message, """

%s

\n

%s

\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): req.item(getskel)[0] = skel class usererror(dispatch.restart): - def __init__(self, message, detail): + def __init__(self, message, *detail): super().__init__() self.message = message self.detail = detail def handle(self, req): - return [skelfor(req).error(self.message, self.detail)] + return skelfor(req).error(req, self.message, *self.detail) class message(dispatch.restart): - def __init__(self, message, detail): + def __init__(self, message, *detail): super().__init__() self.message = message self.detail = detail def handle(self, req): - return [skelfor(req).message(self.message, self.detail)] + return skelfor(req).error(req, self.message, *self.detail) class httperror(usererror): def __init__(self, status, message = None, detail = None): if message is None: message = proto.statusinfo[status][0] if detail is None: - detail = proto.statusinfo[status][1] - super().__init__(message, detail) + detail = (proto.statusinfo[status][1],) + super().__init__(message, *detail) self.status = status def handle(self, req): @@ -80,4 +70,5 @@ class redirect(dispatch.restart): def handle(self, req): req.status(self.status, "Redirect") req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url) + req.ohead["Content-Length"] = 0 return []