prepare NMU

[youtubedl] / youtube_dl / extractor / ebaumsworld.py

diff --git a/youtube_dl/extractor/ebaumsworld.py b/youtube_dl/extractor/ebaumsworld.py
index f02c6998b7c8e316b698f111532d87634323721f..c97682cd367edebfd9fc6a476ad073cb03240054 100644 (file)
--- a/youtube_dl/extractor/ebaumsworld.py
+++ b/youtube_dl/extractor/ebaumsworld.py
@@ -1,36 +1,32 @@
-import re
-import xml.etree.ElementTree
+from __future__ import unicode_literals

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

-from ..utils import determine_ext

 
 
 class EbaumsWorldIE(InfoExtractor):
 
 
 class EbaumsWorldIE(InfoExtractor):

-    _VALID_URL = r'https?://www\.ebaumsworld\.com/video/watch/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?ebaumsworld\.com/videos/[^/]+/(?P<id>\d+)'

 
     _TEST = {
 
     _TEST = {

-        u'url': u'http://www.ebaumsworld.com/video/watch/83367677/',
-        u'file': u'83367677.mp4',
-        u'info_dict': {
-            u'title': u'A Giant Python Opens The Door',
-            u'description': u'This is how nightmares start...',
-            u'uploader': u'jihadpizza',
+        'url': 'http://www.ebaumsworld.com/videos/a-giant-python-opens-the-door/83367677/',
+        'info_dict': {
+            'id': '83367677',
+            'ext': 'mp4',
+            'title': 'A Giant Python Opens The Door',
+            'description': 'This is how nightmares start...',
+            'uploader': 'jihadpizza',

         },
     }
 
     def _real_extract(self, url):
         },
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-        config_xml = self._download_webpage(
+        video_id = self._match_id(url)
+        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 {
             'id': video_id,
             'title': config.find('title').text,
             'url': video_url,
         video_url = config.find('file').text
 
         return {
             'id': video_id,
             'title': config.find('title').text,
             'url': video_url,

-            'ext': determine_ext(video_url),

             'description': config.find('description').text,
             'thumbnail': config.find('image').text,
             'uploader': config.find('username').text,
             'description': config.find('description').text,
             'thumbnail': config.find('image').text,
             'uploader': config.find('username').text,