Merge branch 'master' into python3

[wrw.git] / wrw / sp / cons.py

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 9e81677..eec2e82 100644 (file)
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -9,6 +9,10 @@ class text(node, str):
     def __todom__(self, doc):
         return doc.createTextNode(self)
 
+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
@@ -19,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):
@@ -49,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