Fix Collector #451 and #468

a2d2befc · Evan Simpson · 8f99162b · a2d2befc · a2d2befc · a2d2befc
Commit a2d2befc authored Dec 16, 2002 by Evan Simpson
5 changed files
--- a/lib/python/TAL/TALDefs.py
+++ b/lib/python/TAL/TALDefs.py
@@ -113,13 +113,15 @@ _attr_re = re.compile(r"\s*([^\s]+)\s+([^\s].*)\Z", re.S)
 _subst_re = re.compile(r"\s*(?:(text|structure)\s+)?(.*)\Z", re.S)
 del re

-def parseAttributeReplacements(arg):
+def parseAttributeReplacements(arg, xml):
    dict = {}
    for part in splitParts(arg):
        m = _attr_re.match(part)
        if not m:
            raise TALError("Bad syntax in attributes:" + `part`)
        name, expr = m.group(1, 2)
+        if xml:
+            name = name.lower()
        if dict.has_key(name):
            raise TALError("Duplicate attribute name in attributes:" + `part`)
        dict[name] = expr

--- a/lib/python/TAL/TALGenerator.py
+++ b/lib/python/TAL/TALGenerator.py
@@ -646,7 +646,8 @@ class TALGenerator:
            self.pushProgram()
        if attrsubst or i18nattrs:
            if attrsubst:
-                repldict = TALDefs.parseAttributeReplacements(attrsubst)
+                repldict = TALDefs.parseAttributeReplacements(attrsubst,
+                                                              self.xml)
            else:
                repldict = {}
            if i18nattrs:

--- a/lib/python/TAL/TALParser.py
+++ b/lib/python/TAL/TALParser.py
@@ -72,7 +72,7 @@ class TALParser(XMLParser):
        for key, value in attrlist:
            key, keybase, keyns = self.fixname(key)
            ns = keyns or namens # default to tag namespace
-            item = key, value
+            item = key.lower(), value
            if ns == 'metal':
                metaldict[keybase] = value
                item = item + ("metal",)

--- a/lib/python/TAL/tests/input/test16.xml
+++ b/lib/python/TAL/tests/input/test16.xml
+<?xml version="1.0"?>
+<body xmlns:tal="http://xml.zope.org/namespaces/tal">
+
+<img href="foo" Alt="bar" 
+ tal:attributes="Href string:about:foo;alT string:baz" />
+
+</body>
--- a/lib/python/TAL/tests/output/test16.xml
+++ b/lib/python/TAL/tests/output/test16.xml
+<?xml version="1.0"?>
+<body>
+
+<img href="about:foo" alt="baz"/>
+
+</body>