From 128eb31d90583113083ba1fe329eb4cf42c2989f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Wed, 23 Dec 2015 20:49:41 +0600 Subject: [PATCH] [24video] Fix extraction on python 2.6 --- youtube_dl/extractor/twentyfourvideo.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dl/extractor/twentyfourvideo.py index cb9e5f1b5c..68e2277a4f 100644 --- a/youtube_dl/extractor/twentyfourvideo.py +++ b/youtube_dl/extractor/twentyfourvideo.py @@ -5,6 +5,8 @@ from ..utils import ( parse_iso8601, int_or_none, + xpath_attr, + xpath_element, ) @@ -69,12 +71,14 @@ def _real_extract(self, url): r'http://www.24video.net/video/xml/%s?mode=init' % video_id, video_id, 'Downloading init XML') - video = self._download_xml( + video_xml = self._download_xml( 'http://www.24video.net/video/xml/%s?mode=play' % video_id, - video_id, 'Downloading video XML').find('.//video') + video_id, 'Downloading video XML') + + video = xpath_element(video_xml, './/video', 'video', fatal=True) formats = [{ - 'url': video.attrib['url'], + 'url': xpath_attr(video, '', 'url', 'video URL', fatal=True), }] like_count = int_or_none(video.get('ratingPlus'))