[Zope-Checkins] CVS: Releases/Zope/lib/python/TAL - TALDefs.py:1.34 TALGenerator.py:1.61

Evan Simpson evan@zope.com
Mon, 16 Dec 2002 18:24:33 -0500


Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv25385

Modified Files:
	TALDefs.py TALGenerator.py 
Log Message:
Fix Collector #468 properly


=== Releases/Zope/lib/python/TAL/TALDefs.py 1.33 => 1.34 ===
--- Releases/Zope/lib/python/TAL/TALDefs.py:1.33	Mon Dec 16 18:21:31 2002
+++ Releases/Zope/lib/python/TAL/TALDefs.py	Mon Dec 16 18:24:32 2002
@@ -113,15 +113,14 @@
 _subst_re = re.compile(r"\s*(?:(text|structure)\s+)?(.*)\Z", re.S)
 del re
 
-def parseAttributeReplacements(arg, xml):
+def parseAttributeReplacements(arg):
     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()
+        name = name.lower()
         if dict.has_key(name):
             raise TALError("Duplicate attribute name in attributes:" + `part`)
         dict[name] = expr


=== Releases/Zope/lib/python/TAL/TALGenerator.py 1.60 => 1.61 ===
--- Releases/Zope/lib/python/TAL/TALGenerator.py:1.60	Mon Dec 16 18:21:31 2002
+++ Releases/Zope/lib/python/TAL/TALGenerator.py	Mon Dec 16 18:24:32 2002
@@ -646,8 +646,7 @@
             self.pushProgram()
         if attrsubst or i18nattrs:
             if attrsubst:
-                repldict = TALDefs.parseAttributeReplacements(attrsubst,
-                                                              self.xml)
+                repldict = TALDefs.parseAttributeReplacements(attrsubst)
             else:
                 repldict = {}
             if i18nattrs: