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
eec2e82
..
0c36458
100644
(file)
--- a/
wrw/sp/cons.py
+++ b/
wrw/sp/cons.py
@@
-1,9
+1,8
@@
+import sys
import xml.dom.minidom
class node(object):
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):
class text(node, str):
def __todom__(self, doc):
@@
-36,10
+35,16
@@
class element(node):
el.appendChild(child.__todom__(doc))
return el
el.appendChild(child.__todom__(doc))
return el
+ def __str__(self):
+ doc = xml.dom.minidom.Document()
+ return self.__todom__(doc).toxml()
+
class context(object):
class context(object):
+ charset = (sys.getfilesystemencoding() or "ascii")
+
def __init__(self):
self.nodeconv = {}
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
self.nodeconv[str] = text
self.nodeconv[int] = text
self.nodeconv[float] = text
@@
-54,13
+59,16
@@
class context(object):
raise Exception("No node conversion known for %s objects" % str(type(ob)))
def addchild(self, node, child):
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):
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):
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()
self._ns = ns
self._elcls = elcls
if ctx is None: ctx = context()
@@
-68,3
+76,9
@@
class constructor(object):
def __getattr__(self, name):
return self._elcls(self._ns, name, self._ctx)
def __getattr__(self, name):
return self._elcls(self._ns, name, self._ctx)
+
+class doctype(node):
+ def __init__(self, rootname, pubid, dtdid):
+ self.rootname = rootname
+ self.pubid = pubid
+ self.dtdid = dtdid