Merge tag 'upstream/2014.01.17.2'

[youtubedl] / youtube_dl / extractor / ebaumsworld.py

diff --git a/youtube_dl/extractor/ebaumsworld.py b/youtube_dl/extractor/ebaumsworld.py
index f02c6998b7c8e316b698f111532d87634323721f..877113d63a7261a284a628a06908c466d446613d 100644 (file)
--- a/youtube_dl/extractor/ebaumsworld.py
+++ b/youtube_dl/extractor/ebaumsworld.py
@@ -1,5 +1,4 @@
 import re
 import re

-import xml.etree.ElementTree

 
 from .common import InfoExtractor
 from ..utils import determine_ext
 
 from .common import InfoExtractor
 from ..utils import determine_ext


@@ -21,9 +20,8 @@ class EbaumsWorldIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')

-        config_xml = self._download_webpage(
+        config = self._download_xml(

             'http://www.ebaumsworld.com/video/player/%s' % video_id, video_id)
             'http://www.ebaumsworld.com/video/player/%s' % video_id, video_id)

-        config = xml.etree.ElementTree.fromstring(config_xml.encode('utf-8'))

         video_url = config.find('file').text
 
         return {
         video_url = config.find('file').text
 
         return {