Merge branch 'master' into python3

[wrw.git] / wrw / sp / xhtml.py

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 52e7f9f..73872b4 100644 (file)
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -19,7 +19,7 @@ class xhtmlcontext(_cons.context):
 
     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()
@@ -38,14 +38,15 @@ def head(title=None, css=None):
     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.starttag(el)
+            self.endtag(el)
 
-class htmlindenter(util.indenter, htmlformatter):
+class htmlindenter(util.textindenter, htmlformatter):
     pass
 
 def forreq(req, tree):
@@ -60,4 +61,5 @@ def forreq(req, tree):
 def xhtmlresp(callable):
     def wrapper(req):
         return forreq(req, callable(req))
+    wrapper.__wrapped__ = callable
     return wrapper