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
7058138
..
a7debe6
100644
(file)
--- a/
wrw/sp/xhtml.py
+++ b/
wrw/sp/xhtml.py
@@
-30,7
+30,7
@@
def head(title=None, css=None):
return head
class htmlformatter(util.formatter):
return head
class htmlformatter(util.formatter):
- allowshort = set(["br", "hr", "img", "input"])
+ 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)
def element(self, el, **extra):
if el.name in self.allowshort:
super(htmlformatter, self).element(el, **extra)
@@
-43,7
+43,7
@@
class htmlindenter(util.indenter, htmlformatter):
def forreq(req, tree):
# XXX: Use proper Content-Type for clients accepting it.
req.ohead["Content-Type"] = "text/html; charset=utf-8"
def forreq(req, tree):
# XXX: Use proper Content-Type for clients accepting it.
req.ohead["Content-Type"] = "text/html; charset=utf-8"
- buf = io.
String
IO()
+ buf = io.
Bytes
IO()
htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
return [buf.getvalue()]
htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
return [buf.getvalue()]