Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
sp
/
xhtml.py
diff --git
a/wrw/sp/xhtml.py
b/wrw/sp/xhtml.py
index
a7debe6
..
36b9d60
100644
(file)
--- a/
wrw/sp/xhtml.py
+++ b/
wrw/sp/xhtml.py
@@
-14,7
+14,15
@@
class htmlelement(_cons.element):
doc.appendChild(self.__todom__(doc))
return doc
doc.appendChild(self.__todom__(doc))
return doc
+class xhtmlcontext(_cons.context):
+ attrmap = {"klass": "class"}
+
+ def addattr(self, node, k, v):
+ k = str(k)
+ super().addattr(node, self.attrmap.get(k, k), v)
+
def cons(ctx=None):
def cons(ctx=None):
+ if ctx is None: ctx = xhtmlcontext()
return _cons.constructor(ns, htmlelement, ctx)
def head(title=None, css=None):
return _cons.constructor(ns, htmlelement, ctx)
def head(title=None, css=None):
@@
-33,7
+41,7
@@
class htmlformatter(util.formatter):
allowshort = set(["br", "hr", "img", "input", "meta", "link"])
def element(self, el, **extra):
if el.name in self.allowshort:
allowshort = set(["br", "hr", "img", "input", "meta", "link"])
def element(self, el, **extra):
if el.name in self.allowshort:
- super(
htmlformatter, self
).element(el, **extra)
+ super().element(el, **extra)
else:
self.longtag(el, **extra)
else:
self.longtag(el, **extra)
@@
-45,9
+53,12
@@
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")
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))
def xhtmlresp(callable):
def wrapper(req):
return forreq(req, callable(req))
+ wrapper.__wrapped__ = callable
return wrapper
return wrapper