From: Jaime Marquínez Ferrándiz Date: Sun, 2 Nov 2014 16:28:42 +0000 (+0100) Subject: Do not override stdlib html parser 'locatestarttagend' regex (fixes #4081) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4f195f55f0b734f2897319abf96c5542ce6212d4;p=youtube-dl Do not override stdlib html parser 'locatestarttagend' regex (fixes #4081) '' wouldn't be parsed right (the problem is '/ >', '/>' worked fine). We need to change it in python 2.6 (for example the description of youtube videos wouldn't be extracted). --- diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 233286de8..bdd637e48 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -152,7 +152,9 @@ def xpath_text(node, xpath, name=None, fatal=False): return n.text -compat_html_parser.locatestarttagend = re.compile(r"""<[a-zA-Z][-.a-zA-Z0-9:_]*(?:\s+(?:(?<=['"\s])[^\s/>][^\s/=>]*(?:\s*=+\s*(?:'[^']*'|"[^"]*"|(?!['"])[^>\s]*))?\s*)*)?\s*""", re.VERBOSE) # backport bugfix +if sys.version_info < (2, 7): + compat_html_parser.locatestarttagend = re.compile(r"""<[a-zA-Z][-.a-zA-Z0-9:_]*(?:\s+(?:(?<=['"\s])[^\s/>][^\s/=>]*(?:\s*=+\s*(?:'[^']*'|"[^"]*"|(?!['"])[^>\s]*))?\s*)*)?\s*""", re.VERBOSE) # backport bugfix + class BaseHTMLParser(compat_html_parser.HTMLParser): def __init(self): compat_html_parser.HTMLParser.__init__(self)