-import xml.dom.minidom, io
-from . import cons as _cons
-from . import util
+import xml.dom.minidom, StringIO
+import cons as _cons
+import util
dom = xml.dom.minidom.getDOMImplementation()
-ns = "http://www.w3.org/1999/xhtml"
-doctype = "-//W3C//DTD XHTML 1.1//EN"
-dtd = "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
+ns = u"http://www.w3.org/1999/xhtml"
+doctype = u"-//W3C//DTD XHTML 1.1//EN"
+dtd = u"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
class htmlelement(_cons.element):
def __todoc__(self):
return doc
class xhtmlcontext(_cons.context):
- attrmap = {"klass": "class"}
+ attrmap = {u"klass": u"class"}
def addattr(self, node, k, v):
- k = str(k)
- node.attrs[self.attrmap.get(k, k)] = str(v)
+ k = unicode(k)
+ super(xhtmlcontext, self).addattr(node, self.attrmap.get(k, k), v)
def cons(ctx=None):
if ctx is None: ctx = xhtmlcontext()
head = h.head
if title:
head(h.title(title))
- if isinstance(css, str) or isinstance(css, bytes):
+ if isinstance(css, str) or isinstance(css, unicode):
head(h.link(rel="stylesheet", type="text/css", href=css))
elif css:
for ss in css:
return head
class htmlformatter(util.formatter):
- allowshort = set(["br", "hr", "img", "input", "meta", "link"])
- def element(self, el, **extra):
+ allowshort = set([u"br", u"hr", u"img", u"input", u"meta", u"link"])
+ def shorttag(self, el):
if el.name in self.allowshort:
- super(htmlformatter, self).element(el, **extra)
+ super(htmlformatter, self).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):
# XXX: Use proper Content-Type for clients accepting it.
req.ohead["Content-Type"] = "text/html; charset=utf-8"
- buf = io.BytesIO()
+ buf = StringIO.StringIO()
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):