Merge branch 'master' into python3

Conflicts:
	wrw/sp/util.py

diff --combined wrw/sp/util.py
index df3e6ab,3ea7a8a..ad99e8b
--- 1/wrw/sp/util.py
--- 2/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@@ -1,4 -1,6 +1,6 @@@
 -import StringIO
 -from wrw import dispatch
 -import cons
++import io
++from .. import dispatch
 +from . import cons
  
  def findnsnames(el):
      names = {}
@@@ -6,7 -8,7 +8,7 @@@
      def proc(el):
          if isinstance(el, cons.element):
              if el.ns not in names:
 -                names[el.ns] = u"n" + unicode(nid[0])
 +                names[el.ns] = "n" + str(nid[0])
                  nid[:] = [nid[0] + 1]
              for ch in el.children:
                  proc(ch)
@@@ -32,12 -34,12 +34,12 @@@ class formatter(object)
  
      def quotewrite(self, buf):
          for ch in buf:
 -            if ch == u'&':
 -                self.write(u"&")
 -            elif ch == u'<':
 -                self.write(u"&lt;")
 -            elif ch == u'>':
 -                self.write(u"&gt;")
 +            if ch == '&':
 +                self.write("&amp;")
 +            elif ch == '<':
 +                self.write("&lt;")
 +            elif ch == '>':
 +                self.write("&gt;")
              else:
                  self.write(ch)
  
@@@ -48,15 -50,15 +50,15 @@@
          self.write(el)
  
      def attrval(self, buf):
 -        qc, qt = (u"'", u"&apos;") if u'"' in buf else (u'"', u"&quot;")
 +        qc, qt = ("'", "&apos;") if '"' in buf else ('"', "&quot;")
          self.write(qc)
          for ch in buf:
 -            if ch == u'&':
 -                self.write(u"&amp;")
 -            elif ch == u'<':
 -                self.write(u"&lt;")
 -            elif ch == u'>':
 -                self.write(u"&gt;")
 +            if ch == '&':
 +                self.write("&amp;")
 +            elif ch == '<':
 +                self.write("&lt;")
 +            elif ch == '>':
 +                self.write("&gt;")
              elif ch == qc:
                  self.write(qt)
              else:
@@@ -65,38 -67,38 +67,38 @@@
  
      def attr(self, k, v):
          self.write(k)
 -        self.write(u'=')
 +        self.write('=')
          self.attrval(v)
  
      def shorttag(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 elname(self, el):
          ns = self.nsnames[el.ns]
          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, **extra):
          self.starttag(el, **extra)
@@@ -121,19 -123,19 +123,19 @@@
              raise Exception("Unknown object in element tree: " + el)
  
      def start(self):
 -        self.write(u'<?xml version="1.0" encoding="' + self.charset + u'" ?>\n')
 +        self.write('<?xml version="1.0" encoding="' + self.charset + '" ?>\n')
          if self.doctype:
 -            self.write(u'<!DOCTYPE %s PUBLIC "%s" "%s">\n' % (self.root.name,
 -                                                              self.doctype[0],
 -                                                              self.doctype[1]))
 +            self.write('<!DOCTYPE %s PUBLIC "%s" "%s">\n' % (self.root.name,
 +                                                             self.doctype[0],
 +                                                             self.doctype[1]))
          extra = {}
 -        for uri, nm in self.nsnames.iteritems():
 +        for uri, nm in self.nsnames.items():
              if uri is None:
                  continue
              if nm is None:
 -                extra[u"xmlns"] = uri
 +                extra["xmlns"] = uri
              else:
 -                extra[u"xmlns:" + nm] = uri
 +                extra["xmlns:" + nm] = uri
          self.element(self.root, **extra)
  
      @classmethod
@@@ -144,6 -146,12 +146,12 @@@
      def fragment(cls, out, el, *args, **kw):
          cls(out=out, root=el, *args, **kw).node(el)
  
 -        buf = StringIO.StringIO()
+     @classmethod
+     def format(cls, el, *args, **kw):
++        buf = io.BytesIO()
+         cls.output(buf, el, *args, **kw)
+         return buf.getvalue()
+ 
      def update(self, **ch):
          ret = type(self).__new__(type(self))
          ret.__dict__.update(self.__dict__)
@@@ -157,9 -165,8 +165,9 @@@ class iwriter(object)
          self.col = 0
  
      def write(self, buf):
 -        for c in buf:
 -            if c == '\n':
 +        for i in range(len(buf)):
 +            c = buf[i:i + 1]
 +            if c == b'\n':
                  self.col = 0
              else:
                  self.col += 1
@@@ -170,16 -177,16 +178,16 @@@
          if self.atbol:
              return
          if self.col != 0:
 -            self.write('\n')
 +            self.write(b'\n')
          self.write(indent)
          self.atbol = True
  
  class indenter(formatter):
 -    def __init__(self, indent=u"  ", *args, **kw):
 +    def __init__(self, indent="  ", *args, **kw):
          super(indenter, self).__init__(*args, **kw)
          self.out = iwriter(self.out)
          self.indent = indent
 -        self.curind = u""
 +        self.curind = ""
  
      def simple(self, el):
          for ch in el.children:
@@@ -212,3 -219,20 +220,20 @@@
      def start(self):
          super(indenter, self).start()
          self.write('\n')
 -        super(response, self).__init__()
+ 
+ class response(dispatch.restart):
+     charset = "utf-8"
+     doctype = None
+     formatter = indenter
+ 
+     def __init__(self, root):
++        super().__init__()
+         self.root = root
+ 
+     @property
+     def ctype(self):
+         raise Exception("a subclass of wrw.sp.util.response must override ctype")
+ 
+     def handle(self, req):
+         req.ohead["Content-Type"] = self.ctype
+         return [self.formatter.format(self.root, doctype=self.doctype, charset=self.charset)]