X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;fp=wrw%2Fsp%2Fcons.py;h=168f29752e6e9468d513485d0066b7f61207acaf;hp=9df4725ede9220ffbf0695c5be887747ce466008;hb=af9ecd26fa64bc8f9890952f2d9e6b6147650416;hpb=54e74e803911e7fb0f861eb33b5b0d053cb7e79b diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py index 9df4725..168f297 100644 --- a/wrw/sp/cons.py +++ b/wrw/sp/cons.py @@ -1,9 +1,7 @@ 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): @@ -23,9 +21,9 @@ class element(node): def __call__(self, *children, **attrs): for child in children: - self.children.append(self.ctx.nodefrom(child)) + self.ctx.addchild(self, child) for k, v in attrs.iteritems(): - self.attrs[unicode(k)] = unicode(v) + self.ctx.addattr(self, k, v) return self def __todom__(self, doc): @@ -36,6 +34,10 @@ 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): def __init__(self): self.nodeconv = {} @@ -54,6 +56,12 @@ class context(object): return self.nodeconv[type(ob)](ob) raise Exception("No node conversion known for %s objects" % str(type(ob))) + def addchild(self, node, child): + node.children.append(self.nodefrom(child)) + + def addattr(self, node, k, v): + node.attrs[unicode(k)] = unicode(v) + class constructor(object): def __init__(self, ns, elcls = element, ctx=None): self._ns = ns