X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fxhtml.py;h=a7debe62f07968c9b9b8c8259816c4d096bef25a;hb=825ac8f0cafe69dfb61c127556ef50f0f92e6168;hp=70581382bd50f381d16074fe53e68c1c172644f2;hpb=a878e812794ab36d47721a680a1bea5f4e1bcc45;p=wrw.git

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 7058138..a7debe6 100644
--- 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):
-    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)
@@ -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"
-    buf = io.StringIO()
+    buf = io.BytesIO()
     htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
     return [buf.getvalue()]