From: Fred Drake <fdrake@acm.org>
Date: Wed, 14 Mar 2001 16:18:56 +0000 (+0000)
Subject: Change "[%s]" % string.whitespace to r"\s" in regular expressions.
X-Git-Tag: v2.1b2~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62dfed96beb1572134b6165a032cfbaa3882f2f3;p=thirdparty%2FPython%2Fcpython.git

Change "[%s]" % string.whitespace to r"\s" in regular expressions.
---

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