diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-26 18:48:52 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-26 19:17:25 +0100 |
| commit | e26f8712289c727a43d74a4669aee4924b9f75f2 (patch) | |
| tree | ce2e34f10baacc0eb24d0527154e5374560901cd /youtube_dl/extractor/internetvideoarchive.py | |
| parent | 6e47b51eef26dbaa3634b73914e4ee7213ad38f7 (diff) | |
| download | youtube-dl-e26f8712289c727a43d74a4669aee4924b9f75f2.tar.gz youtube-dl-e26f8712289c727a43d74a4669aee4924b9f75f2.tar.xz youtube-dl-e26f8712289c727a43d74a4669aee4924b9f75f2.zip | |
Use the new '_download_xml' helper in more extractors
Diffstat (limited to 'youtube_dl/extractor/internetvideoarchive.py')
| -rw-r--r-- | youtube_dl/extractor/internetvideoarchive.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py index be8e05f53..16a6f73c8 100644 --- a/youtube_dl/extractor/internetvideoarchive.py +++ b/youtube_dl/extractor/internetvideoarchive.py @@ -1,5 +1,4 @@ import re -import xml.etree.ElementTree from .common import InfoExtractor from ..utils import ( @@ -43,9 +42,8 @@ class InternetVideoArchiveIE(InfoExtractor): video_id = query_dic['publishedid'][0] url = self._build_url(query) - flashconfiguration_xml = self._download_webpage(url, video_id, + flashconfiguration = self._download_xml(url, video_id, u'Downloading flash configuration') - flashconfiguration = xml.etree.ElementTree.fromstring(flashconfiguration_xml.encode('utf-8')) file_url = flashconfiguration.find('file').text file_url = file_url.replace('/playlist.aspx', '/mrssplaylist.aspx') # Replace some of the parameters in the query to get the best quality @@ -53,9 +51,8 @@ class InternetVideoArchiveIE(InfoExtractor): file_url = re.sub(r'(?<=\?)(.+)$', lambda m: self._clean_query(m.group()), file_url) - info_xml = self._download_webpage(file_url, video_id, + info = self._download_xml(file_url, video_id, u'Downloading video info') - info = xml.etree.ElementTree.fromstring(info_xml.encode('utf-8')) item = info.find('channel/item') def _bp(p): |