Fixed our HTMLParser patches for python 2.7.4

django · Jun 22, 2012 · 6bc1b22 · 6bc1b22
1 parent a54a8ba
commit 6bc1b22
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
@@ -1,6 +1,7 @@
 import HTMLParser as _HTMLParser
 import re
 
+tagfind = re.compile('([a-zA-Z][-.a-zA-Z0-9:_]*)(?:\s|/(?!>))*')
 
 class HTMLParser(_HTMLParser.HTMLParser):
     """
@@ -33,10 +34,10 @@ def parse_starttag(self, i):
 
         # Now parse the data between i+1 and j into a tag and attrs
         attrs = []
-        match = _HTMLParser.tagfind.match(rawdata, i + 1)
+        match = tagfind.match(rawdata, i + 1)
         assert match, 'unexpected call to parse_starttag()'
         k = match.end()
-        self.lasttag = tag = rawdata[i + 1:k].lower()
+        self.lasttag = tag = match.group(1).lower()
 
         while k < endpos:
             m = _HTMLParser.attrfind.match(rawdata, k)
@@ -48,6 +49,7 @@ def parse_starttag(self, i):
             elif attrvalue[:1] == '\'' == attrvalue[-1:] or \
                  attrvalue[:1] == '"' == attrvalue[-1:]:
                 attrvalue = attrvalue[1:-1]
+            if attrvalue:
                 attrvalue = self.unescape(attrvalue)
             attrs.append((attrname.lower(), attrvalue))
             k = m.end()