X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=d8b30a81dceb716d205eafa985ee013134859291;hp=cb9d451b7984948958058d89dfe73a82ced37ef4;hb=5afb31180662cfaf123ae6155a832470c7c6dce2;hpb=784495582d53f5b759dd216ddd1268fbe2479bb9 diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py index cb9d451..d8b30a8 100644 --- a/wrw/sp/cons.py +++ b/wrw/sp/cons.py @@ -1,4 +1,4 @@ -import sys +import sys, collections import xml.dom.minidom class node(object): @@ -40,7 +40,7 @@ class element(node): return self.__todom__(doc).toxml() class context(object): - charset = sys.getfilesystemencoding() + charset = (sys.getfilesystemencoding() or "ascii") def __init__(self): self.nodeconv = {} @@ -56,10 +56,19 @@ class context(object): return ob.__tonode__() if type(ob) in self.nodeconv: return self.nodeconv[type(ob)](ob) - raise Exception("No node conversion known for %s objects" % str(type(ob))) + return None def addchild(self, node, child): - node.children.append(self.nodefrom(child)) + if child is None: + return + new = self.nodefrom(child) + if new is not None: + node.children.append(new) + elif isinstance(child, collections.Iterable): + for ch in child: + self.addchild(node, ch) + else: + raise Exception("No node conversion known for %s objects" % str(type(child))) def addattr(self, node, k, v): if v is not None: @@ -74,3 +83,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