def addattr(self, node, k, v):
k = str(k)
- node.attrs[self.attrmap.get(k, k)] = str(v)
+ super().addattr(node, self.attrmap.get(k, k), v)
def cons(ctx=None):
if ctx is None: ctx = xhtmlcontext()
return head
class htmlformatter(util.formatter):
- allowshort = set(["br", "hr", "img", "input", "meta", "link"])
- def element(self, el, **extra):
+ allowshort = {"br", "hr", "img", "input", "meta", "link"}
+ def shorttag(self, el):
if el.name in self.allowshort:
- super(htmlformatter, self).element(el, **extra)
+ super().shorttag(el)
else:
- self.longtag(el, **extra)
+ self.handle(">", el)
+ self.handle("<", el)
-class htmlindenter(util.indenter, htmlformatter):
+class htmlindenter(util.textindenter, htmlformatter):
pass
def forreq(req, tree):
req.ohead["Content-Type"] = "text/html; charset=utf-8"
buf = io.BytesIO()
htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
- return [buf.getvalue()]
+ ret = buf.getvalue()
+ req.ohead["Content-Length"] = len(ret)
+ return [ret]
def xhtmlresp(callable):
def wrapper(req):
return forreq(req, callable(req))
+ wrapper.__wrapped__ = callable
return wrapper