X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=4052dce03344e06ee3c00c31b255461f0664cd4e;hb=4c4dcf7a020ed52ea9d8d9048dbd62ffa3a7d54d;hp=5341b20f44dc6495c91662bb7238810ef1851d42;hpb=ff79cdbf7d4d95e6a84d6b002e28e6df86847954;p=wrw.git

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 5341b20..4052dce 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,14 +1,16 @@
 import xml.dom.minidom
 
 class node(object):
-    def __str__(self):
-        doc = xml.dom.minidom.Document()
-        return self.__todom__(doc).toxml()
+    pass
 
 class text(node, unicode):
     def __todom__(self, doc):
         return doc.createTextNode(self)
 
+class raw(node, unicode):
+    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 +21,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():
-            self.attrs[unicode(k)] = unicode(v)
+            self.ctx.addattr(self, k, v)
         return self
 
     def __todom__(self, doc):
@@ -32,6 +34,10 @@ class element(node):
             el.appendChild(child.__todom__(doc))
         return el
 
+    def __str__(self):
+        doc = xml.dom.minidom.Document()
+        return self.__todom__(doc).toxml()
+
 class context(object):
     def __init__(self):
         self.nodeconv = {}
@@ -50,8 +56,15 @@ 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):
+        if v is not None:
+            node.attrs[unicode(k)] = unicode(v)
+
 class constructor(object):
-    def __init__(self, ns, elcls = element, ctx=None):
+    def __init__(self, ns, elcls=element, ctx=None):
         self._ns = ns
         self._elcls = elcls
         if ctx is None: ctx = context()