From: Fred Drake <fdrake@acm.org>
Date: Thu, 16 Apr 1998 21:04:26 +0000 (+0000)
Subject: Fix regexp for attrfind; bug reported by Lars Marius Garshol
X-Git-Tag: v1.5.2a1~902
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de2f708299662fb1646fb6d16f30361e6c5fd558;p=thirdparty%2FPython%2Fcpython.git

Fix regexp for attrfind; bug reported by Lars Marius Garshol
<larsga@ifi.uio.no>.
---

diff --git a/Lib/sgmllib.py b/Lib/sgmllib.py
index 035e891e5e0f..956341c8feab 100644
--- a/Lib/sgmllib.py
+++ b/Lib/sgmllib.py
@@ -30,12 +30,12 @@ endtagopen = re.compile('</[<>a-zA-Z]')
 endbracket = re.compile('[<>]')
 special = re.compile('<![^<>]*>')
 commentopen = re.compile('<!--')
-commentclose = re.compile('--[ \t\n]*>')
+commentclose = re.compile('--[%s]*>' % string.whitespace)
 tagfind = re.compile('[a-zA-Z][a-zA-Z0-9]*')
 attrfind = re.compile(
-    '[ \t\n]+([a-zA-Z_][-.a-zA-Z_0-9]*)'
-    '([ \t\n]*=[ \t\n]*'
-    r'(\'[^\']*\'|"[^"]*"|[-a-zA-Z0-9./:+*%?!\(\)_#=~]*))?')
+    '[ \t\n\r]+([a-zA-Z_][-.a-zA-Z_0-9]*)'
+    + ('([%s]*=[%s]*' % (string.whitespace, string.whitespace))
+    + r'(\'[^\']*\'|"[^"]*"|[-a-zA-Z0-9./:+*%?!\(\)_#=~]*))?')
 
 
 # SGML parser base class -- find tags and call handler functions.