Merge tag 'upstream/2013.12.23'

[youtubedl] / youtube_dl / extractor / internetvideoarchive.py

diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py
index be8e05f539d7f64c301f7a63a488aedbf9d129cd..16a6f73c87e27d47d401c444aa02b80d5a6313b3 100644 (file)
--- a/youtube_dl/extractor/internetvideoarchive.py
+++ b/youtube_dl/extractor/internetvideoarchive.py
@@ -1,5 +1,4 @@
 import re
 import re

-import xml.etree.ElementTree

 
 from .common import InfoExtractor
 from ..utils import (
 
 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)
 
         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')
             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
         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)
         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')
             u'Downloading video info')

-        info = xml.etree.ElementTree.fromstring(info_xml.encode('utf-8'))

         item = info.find('channel/item')
 
         def _bp(p):
         item = info.find('channel/item')
 
         def _bp(p):