-from . import dispatch, proto, env
-from .sp import xhtml
+import dispatch, proto, env
+from sp import xhtml
h = xhtml.cons()
__all__ = ["skeleton", "skelfor", "setskel", "usererror"]
class usererror(dispatch.restart):
def __init__(self, message, *detail):
- super().__init__()
+ super(usererror, self).__init__()
self.message = message
self.detail = detail
return skelfor(req).error(req, self.message, *self.detail)
class message(dispatch.restart):
- def __init__(self, message, *detail):
- super().__init__()
- self.message = message
+ def __init__(self, msg, *detail):
+ super(message, self).__init__()
+ self.message = msg
self.detail = detail
def handle(self, req):
- return skelfor(req).error(req, self.message, *self.detail)
+ return skelfor(req).message(req, self.message, *self.detail)
class httperror(usererror):
- def __init__(self, status, message = None, detail = None):
+ 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)
+ super(httperror, self).__init__(message, *detail)
self.status = status
def handle(self, req):
req.status(self.status, self.message)
- return super().handle(req)
+ return super(httperror, self).handle(req)
class notfound(httperror):
def __init__(self):
- return super().__init__(404)
+ return super(notfound, self).__init__(404)
class redirect(dispatch.restart):
- def __init__(self, url, status = 303):
- super().__init__()
+ bases = {"url": proto.requrl,
+ "script": proto.scripturl,
+ "site": proto.siteurl}
+
+ def __init__(self, url, status=303, base="url"):
+ super(redirect, self).__init__()
self.url = url
self.status = status
+ self.bases[base]
+ self.base = base
def handle(self, req):
req.status(self.status, "Redirect")
- req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
+ req.ohead["Location"] = proto.appendurl(self.bases[self.base](req), self.url)
req.ohead["Content-Length"] = 0
return []
+
+class unmodified(dispatch.restart):
+ def handle(self, req):
+ req.status(304, "Not Modified")
+ req.ohead["Content-Length"] = "0"
+ return []