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

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 4052dce..ff6a1b1 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,3 +1,4 @@
+import sys
 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[str] = lambda ob: text(ob, "utf-8")
+        self.nodeconv[str] = lambda ob: text(ob, self.charset)
         self.nodeconv[unicode] = text
         self.nodeconv[int] = text
         self.nodeconv[long] = text
@@ -57,6 +60,8 @@ class context(object):
         raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
     def addchild(self, node, child):
+        if child is None:
+            return
         node.children.append(self.nodefrom(child))
 
     def addattr(self, node, k, v):