X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fxhtml.py;h=73872b45b1641727d97967bfee731e7e504a7e67;hb=919b8a4ff35da1fce73f238754ef376705c52e18;hp=50c70b6e7e3260d5f70ee01549acc613ca246aec;hpb=d38b200493b3ed263dbf10581d6d204462ed68c4;p=wrw.git

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index 50c70b6..73872b4 100644
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -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):