Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py

diff --cc wrw/sp/cons.py
index d54c314,8366cc7..eec2e82
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -23,9 -23,9 +23,9 @@@ class element(node)
  
      def __call__(self, *children, **attrs):
          for child in children:
-             self.children.append(self.ctx.nodefrom(child))
+             self.ctx.addchild(self, child)
 -        for k, v in attrs.iteritems():
 +        for k, v in attrs.items():
-             self.attrs[str(k)] = str(v)
+             self.ctx.addattr(self, k, v)
          return self
  
      def __todom__(self, doc):
@@@ -53,6 -54,12 +53,12 @@@ class context(object)
              return self.nodeconv[type(ob)](ob)
          raise Exception("No node conversion known for %s objects" % str(type(ob)))
  
 -        node.attrs[unicode(k)] = unicode(v)
+     def addchild(self, node, child):
+         node.children.append(self.nodefrom(child))
+ 
+     def addattr(self, node, k, v):
++        node.attrs[str(k)] = str(v)
+ 
  class constructor(object):
      def __init__(self, ns, elcls = element, ctx=None):
          self._ns = ns

diff --cc wrw/sp/xhtml.py
index a7debe6,3c6c0f6..17c5678
--- 1/wrw/sp/xhtml.py
--- 2/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@@ -14,7 -14,15 +14,15 @@@ class htmlelement(_cons.element)
          doc.appendChild(self.__todom__(doc))
          return doc
  
 -    attrmap = {u"klass": u"class"}
+ class xhtmlcontext(_cons.context):
 -        k = unicode(k)
 -        node.attrs[self.attrmap.get(k, k)] = unicode(v)
++    attrmap = {"klass": "class"}
+ 
+     def addattr(self, node, k, v):
++        k = str(k)
++        node.attrs[self.attrmap.get(k, k)] = str(v)
+ 
  def cons(ctx=None):
+     if ctx is None: ctx = xhtmlcontext()
      return _cons.constructor(ns, htmlelement, ctx)
  
  def head(title=None, css=None):