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

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index ce258c6..99656a3 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,20 +1,21 @@
+import sys
 import xml.dom.minidom
 
 class node(object):
     pass
 
-class text(node, unicode):
+class text(node, str):
     def __todom__(self, doc):
         return doc.createTextNode(self)
 
-class raw(node, unicode):
+class raw(node, str):
     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
-        self.name = unicode(name)
+        self.name = str(name)
         self.ctx = ctx
         self.attrs = {}
         self.children = []
@@ -22,13 +23,13 @@ class element(node):
     def __call__(self, *children, **attrs):
         for child in children:
             self.ctx.addchild(self, child)
-        for k, v in attrs.iteritems():
+        for k, v in attrs.items():
             self.ctx.addattr(self, k, v)
         return self
 
     def __todom__(self, doc):
         el = doc.createElementNS(self.ns, self.name)
-        for k, v in self.attrs.iteritems():
+        for k, v in self.attrs.items():
             el.setAttribute(k, v)
         for child in self.children:
             el.appendChild(child.__todom__(doc))
@@ -39,12 +40,13 @@ 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[unicode] = text
+        self.nodeconv[bytes] = lambda ob: text(ob, self.charset)
+        self.nodeconv[str] = text
         self.nodeconv[int] = text
-        self.nodeconv[long] = text
         self.nodeconv[float] = text
 
     def nodefrom(self, ob):
@@ -60,7 +62,8 @@ class context(object):
         node.children.append(self.nodefrom(child))
 
     def addattr(self, node, k, v):
-        node.attrs[unicode(k)] = unicode(v)
+        if v is not None:
+            node.attrs[str(k)] = str(v)
 
 class constructor(object):
     def __init__(self, ns, elcls=element, ctx=None):