X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=bc9bfa2b23188831a2c3157de1683e5ff7ee8551;hb=fb5f9f27dcabe7fac75e3a69f820c42779539239;hp=8366cc7cff1d5d0190618537c942cec2f1b4f361;hpb=a573465ea03bd2a484252e87e0364d9376ec6bfc;p=wrw.git diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py index 8366cc7..bc9bfa2 100644 --- a/wrw/sp/cons.py +++ b/wrw/sp/cons.py @@ -1,9 +1,8 @@ +import sys import xml.dom.minidom class node(object): - def __str__(self): - doc = xml.dom.minidom.Document() - return self.__todom__(doc).toxml() + pass class text(node, unicode): def __todom__(self, doc): @@ -36,10 +35,16 @@ class element(node): el.appendChild(child.__todom__(doc)) return el + def __str__(self): + doc = xml.dom.minidom.Document() + 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 @@ -55,13 +60,16 @@ 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): - node.attrs[unicode(k)] = unicode(v) + if v is not None: + node.attrs[unicode(k)] = unicode(v) 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() @@ -69,3 +77,9 @@ class constructor(object): 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