From: Philipp Hagemeister Date: Sat, 13 Sep 2014 06:34:15 +0000 (+0200) Subject: [utils] Fix find_xpath_attr on 2.6 X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4eefbfdbfd472398ed5e40b13d20e3a92f837f52;p=youtube-dl [utils] Fix find_xpath_attr on 2.6 --- diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index d920c65a4..8828161e5 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -280,6 +280,11 @@ if sys.version_info >= (2, 7): return node.find(expr) else: def find_xpath_attr(node, xpath, key, val): + # Here comes the crazy part: In 2.6, if the xpath is a unicode, + # .//node does not match if a node is a direct child of . ! + if isinstance(xpath, unicode): + xpath = xpath.encode('ascii') + for f in node.findall(xpath): if f.attrib.get(key) == val: return f