Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index d54c314..eec2e82 100644 (file)
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -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.items():
-            self.attrs[str(k)] = str(v)
+            self.ctx.addattr(self, k, v)
         return self
 
     def __todom__(self, doc):
@@ -53,6 +53,12 @@ class context(object):
             return self.nodeconv[type(ob)](ob)
         raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
+    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 --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index a7debe6..17c5678 100644 (file)
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -14,7 +14,15 @@ class htmlelement(_cons.element):
         doc.appendChild(self.__todom__(doc))
         return doc
 
+class xhtmlcontext(_cons.context):
+    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):