X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=99656a3b14ea5170a358dfcb0dee142980f3c1d7;hb=6d2e09cf5bf8ddfa126ca16d536f6b42e502f0ce;hp=eec2e820b5fd02836dbec7201991d15562fff498;hpb=26648796c1d6c3c528ad7cdb108ecb086cfa5784;p=wrw.git

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index eec2e82..99656a3 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):
@@ -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() 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
@@ -57,10 +62,11 @@ class context(object):
         node.children.append(self.nodefrom(child))
 
     def addattr(self, node, k, v):
-        node.attrs[str(k)] = str(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()