X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=cb9d451b7984948958058d89dfe73a82ced37ef4;hb=784495582d53f5b759dd216ddd1268fbe2479bb9;hp=d54c3140bab3ebbfad5984d5b385ac2a34ead8ec;hpb=0d1857825b3d370a9249436f162300cc4862006c;p=wrw.git

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index d54c314..cb9d451 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,9 +1,8 @@
+import sys
 import xml.dom.minidom
 
 class node(object):
-    def __str__(self):
-        doc = xml.dom.minidom.Document()
-        return self.__todom__(doc).toxml()
+    pass
 
 class text(node, str):
     def __todom__(self, doc):
@@ -23,9 +22,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):
@@ -36,10 +35,16 @@ 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):
+    charset = sys.getfilesystemencoding()
+
     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,8 +58,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[str(k)] = str(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()