Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
sp
/
cons.py
diff --git
a/wrw/sp/cons.py
b/wrw/sp/cons.py
index
5341b20
..
d54c314
100644
(file)
--- 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()
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)
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
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 = []
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))
def __call__(self, *children, **attrs):
for child in children:
self.children.append(self.ctx.nodefrom(child))
- for k, v in attrs.ite
rite
ms():
- 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)
return self
def __todom__(self, doc):
el = doc.createElementNS(self.ns, self.name)
- for k, v in self.attrs.ite
rite
ms():
+ for k, v in self.attrs.items():
el.setAttribute(k, v)
for child in self.children:
el.appendChild(child.__todom__(doc))
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 = {}
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[int] = text
- self.nodeconv[long] = text
self.nodeconv[float] = text
def nodefrom(self, ob):
self.nodeconv[float] = text
def nodefrom(self, ob):