X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=d54c3140bab3ebbfad5984d5b385ac2a34ead8ec;hb=ab92e396057cd617b1607f437d860ff89f5780a2;hp=5341b20f44dc6495c91662bb7238810ef1851d42;hpb=313cc8f23e7a5656a6d2ad9e56e94e0e119c8f85;p=wrw.git

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 5341b20..d54c314 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -5,14 +5,18 @@ class node(object):
         doc = xml.dom.minidom.Document()
         return self.__todom__(doc).toxml()
 
-class text(node, unicode):
+class text(node, str):
     def __todom__(self, doc):
         return doc.createTextNode(self)
 
+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 = []
@@ -20,13 +24,13 @@ class element(node):
     def __call__(self, *children, **attrs):
         for child in children:
             self.children.append(self.ctx.nodefrom(child))
-        for k, v in attrs.iteritems():
-            self.attrs[unicode(k)] = unicode(v)
+        for k, v in attrs.items():
+            self.attrs[str(k)] = str(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))
@@ -35,10 +39,9 @@ class element(node):
 class context(object):
     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, "utf-8")
+        self.nodeconv[str] = text
         self.nodeconv[int] = text
-        self.nodeconv[long] = text
         self.nodeconv[float] = text
 
     def nodefrom(self, ob):