Merge branch 'master' into python3

diff --cc wrw/sp/util.py
index ba75cac,50fbd90..df3e6ab
--- 1/wrw/sp/util.py
--- 2/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@@ -83,22 -83,22 +83,22 @@@ class formatter(object)
          if ns is None:
              return el.name
          else:
 -            return ns + u':' + el.name
 +            return ns + ':' + el.name
  
      def starttag(self, el, **extra):
 -        self.write(u'<' + self.elname(el))
 -        for k, v in el.attrs.iteritems():
 -            self.write(u' ')
 +        self.write('<' + self.elname(el))
 +        for k, v in el.attrs.items():
 +            self.write(' ')
              self.attr(k, v)
 -        for k, v in extra.iteritems():
 -            self.write(u' ')
 +        for k, v in extra.items():
 +            self.write(' ')
              self.attr(k, v)
 -        self.write(u'>')
 +        self.write('>')
  
      def endtag(self, el):
 -        self.write(u'</' + self.elname(el) + u'>')
 +        self.write('</' + self.elname(el) + '>')
  
-     def longtag(self, el):
+     def longtag(self, el, **extra):
          self.starttag(el, **extra)
          for ch in el.children:
              self.node(ch)