[ZPT] CVS: Zope/lib/python/TAL - HTMLParser.py:1.21.30.2

Fred L. Drake, Jr. fdrake@acm.org
Tue, 14 May 2002 11:33:23 -0400


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

Modified Files:
      Tag: Zope-2_5-branch
	HTMLParser.py 
Log Message:
Simplify code to allow multiple "false" end tags in CDATA content.

=== Zope/lib/python/TAL/HTMLParser.py 1.21.30.1 => 1.21.30.2 ===
                 elif endtagopen.match(rawdata, i): # </
                     k = self.parse_endtag(i)
-                    if k >= 0:
-                        self.clear_cdata_mode()
                 elif _contains_at(rawdata, "<!--", i): # <!--
                     k = self.parse_comment(i)
                 elif _contains_at(rawdata, "<!", i): # <!
@@ -350,6 +348,7 @@
             self.handle_data(match.group(0))
         else:
             self.handle_endtag(tag)
+            self.clear_cdata_mode()
         return j
 
     # Overridable -- finish processing of start+end tag: <tag.../>