Merge branch 'master' into python3

diff --cc wrw/session.py
Simple merge

diff --cc wrw/sp/cons.py
index 9e81677,9df4725..d54c314
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -9,6 -9,10 +9,10 @@@ class text(node, str)
      def __todom__(self, doc):
          return doc.createTextNode(self)
  
 -class raw(node, unicode):
++class raw(node, str):
+     def __todom__(self, doc):
+         raise Exception("Cannot convert raw code to DOM objects")
+ 
  class element(node):
      def __init__(self, ns, name, ctx):
          self.ns = ns

diff --cc wrw/sp/util.py
index c9f9401,a913e74..adad537
--- 1/wrw/sp/util.py
--- 2/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@@ -44,16 -44,19 +44,19 @@@ class formatter(object)
      def text(self, el):
          self.quotewrite(el)
  
+     def rawcode(self, el):
+         self.write(el)
+ 
      def attrval(self, buf):
 -        qc, qt = (u"'", u"'") if u'"' in buf else (u'"', u""")
 +        qc, qt = ("'", "'") if '"' in buf else ('"', """)
          self.write(qc)
          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;")
              elif ch == qc:
                  self.write(qt)
              else:

diff --cc wrw/util.py
Simple merge