Commit cc2e1475 authored by Guido van Rossum's avatar Guido van Rossum

Cosmetic improvements to checkSpuriousAttributes().

parent 091b862d
...@@ -211,13 +211,15 @@ class METALCompiler(DOMVisitor): ...@@ -211,13 +211,15 @@ class METALCompiler(DOMVisitor):
def checkSpuriousAttributes(self, node, def checkSpuriousAttributes(self, node,
ns=ZOPE_METAL_NS, ns=ZOPE_METAL_NS,
known=KNOWN_METAL_ATTRIBUTES): known=KNOWN_METAL_ATTRIBUTES,
error=METALError,
what="METAL"):
for attr in node.attributes.values(): for attr in node.attributes.values():
if attr.namespaceURI == ns: if attr.namespaceURI == ns:
if attr.localName not in known: if attr.localName not in known:
raise METALError( raise error(
"bad METAL attribute: %s;\nallowed are: %s" % "bad %s attribute: %s;\nallowed are: %s" %
(repr(attr.name), string.join(known))) (what, repr(attr.name), string.join(known)))
def expandElement(self, node): def expandElement(self, node):
macroName = node.getAttributeNS(ZOPE_METAL_NS, "use-macro") macroName = node.getAttributeNS(ZOPE_METAL_NS, "use-macro")
...@@ -318,7 +320,7 @@ class TALCompiler(METALCompiler): ...@@ -318,7 +320,7 @@ class TALCompiler(METALCompiler):
def checkSpuriousAttributes(self, node): def checkSpuriousAttributes(self, node):
METALCompiler.checkSpuriousAttributes(self, node) METALCompiler.checkSpuriousAttributes(self, node)
METALCompiler.checkSpuriousAttributes( METALCompiler.checkSpuriousAttributes(
self, node, ZOPE_TAL_NS, KNOWN_TAL_ATTRIBUTES) self, node, ZOPE_TAL_NS, KNOWN_TAL_ATTRIBUTES, TALError, "TAL")
def emitDefines(self, defines): def emitDefines(self, defines):
for part in splitParts(defines): for part in splitParts(defines):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment