From: Fredrik Tolf Date: Sun, 23 Dec 2012 04:57:01 +0000 (+0100) Subject: Added support for mapping around reserved keywords in SP attribute assignment. X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=a573465ea03bd2a484252e87e0364d9376ec6bfc;p=wrw.git Added support for mapping around reserved keywords in SP attribute assignment. --- diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py index 9df4725..8366cc7 100644 --- a/wrw/sp/cons.py +++ b/wrw/sp/cons.py @@ -23,9 +23,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): @@ -54,6 +54,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 diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py index 928dcd9..3c6c0f6 100644 --- a/wrw/sp/xhtml.py +++ b/wrw/sp/xhtml.py @@ -14,7 +14,15 @@ class htmlelement(_cons.element): doc.appendChild(self.__todom__(doc)) return doc +class xhtmlcontext(_cons.context): + attrmap = {u"klass": u"class"} + + def addattr(self, node, k, v): + k = unicode(k) + node.attrs[self.attrmap.get(k, k)] = unicode(v) + def cons(ctx=None): + if ctx is None: ctx = xhtmlcontext() return _cons.constructor(ns, htmlelement, ctx) def head(title=None, css=None):