Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw

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

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 205de03..d8b30a8 100644 (file)
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,3 +1,4 @@
+import sys, collections
 import xml.dom.minidom
 
 class node(object):
@@ -39,9 +40,11 @@ class element(node):
         return self.__todom__(doc).toxml()
 
 class context(object):
+    charset = (sys.getfilesystemencoding() or "ascii")
+
     def __init__(self):
         self.nodeconv = {}
-        self.nodeconv[bytes] = lambda ob: text(ob, "utf-8")
+        self.nodeconv[bytes] = lambda ob: text(ob, self.charset)
         self.nodeconv[str] = text
         self.nodeconv[int] = text
         self.nodeconv[float] = text
@@ -53,10 +56,19 @@ class context(object):
             return ob.__tonode__()
         if type(ob) in self.nodeconv:
             return self.nodeconv[type(ob)](ob)
-        raise Exception("No node conversion known for %s objects" % str(type(ob)))
+        return None
 
     def addchild(self, node, child):
-        node.children.append(self.nodefrom(child))
+        if child is None:
+            return
+        new = self.nodefrom(child)
+        if new is not None:
+            node.children.append(new)
+        elif isinstance(child, collections.Iterable):
+            for ch in child:
+                self.addchild(node, ch)
+        else:
+            raise Exception("No node conversion known for %s objects" % str(type(child)))
 
     def addattr(self, node, k, v):
         if v is not None:
@@ -71,3 +83,9 @@ class constructor(object):
 
     def __getattr__(self, name):
         return self._elcls(self._ns, name, self._ctx)
+
+class doctype(node):
+    def __init__(self, rootname, pubid, dtdid):
+        self.rootname = rootname
+        self.pubid = pubid
+        self.dtdid = dtdid