Merge tag 'upstream/2015.02.06'

[youtubedl] / youtube_dl / extractor / myspass.py

diff --git a/youtube_dl/extractor/myspass.py b/youtube_dl/extractor/myspass.py
index 7b016bb86a239ae9252f1e4864de667cb78fc62f..5b9b9fbcd0844897d6d63305ed00729e70c7f4fb 100644 (file)
--- a/youtube_dl/extractor/myspass.py
+++ b/youtube_dl/extractor/myspass.py
@@ -1,16 +1,27 @@
+from __future__ import unicode_literals

 import os.path
 import os.path

-import xml.etree.ElementTree

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_urllib_parse_urlparse,
     compat_urllib_parse_urlparse,

-
+)
+from ..utils import (

     ExtractorError,
 )
 
 
 class MySpassIE(InfoExtractor):
     ExtractorError,
 )
 
 
 class MySpassIE(InfoExtractor):

-    _VALID_URL = r'http://www.myspass.de/.*'
+    _VALID_URL = r'http://www\.myspass\.de/.*'
+    _TEST = {
+        'url': 'http://www.myspass.de/myspass/shows/tvshows/absolute-mehrheit/Absolute-Mehrheit-vom-17022013-Die-Highlights-Teil-2--/11741/',
+        'md5': '0b49f4844a068f8b33f4b7c88405862b',
+        'info_dict': {
+            'id': '11741',
+            'ext': 'mp4',
+            "description": "Wer kann in die Fu\u00dfstapfen von Wolfgang Kubicki treten und die Mehrheit der Zuschauer hinter sich versammeln? Wird vielleicht sogar die Absolute Mehrheit geknackt und der Jackpot von 200.000 Euro mit nach Hause genommen?",
+            "title": "Absolute Mehrheit vom 17.02.2013 - Die Highlights, Teil 2",
+        },
+    }

 
     def _real_extract(self, url):
         META_DATA_URL_TEMPLATE = 'http://www.myspass.de/myspass/includes/apps/video/getvideometadataxml.php?id=%s'
 
     def _real_extract(self, url):
         META_DATA_URL_TEMPLATE = 'http://www.myspass.de/myspass/includes/apps/video/getvideometadataxml.php?id=%s'


@@ -24,18 +35,16 @@ class MySpassIE(InfoExtractor):
 
         # get metadata
         metadata_url = META_DATA_URL_TEMPLATE % video_id
 
         # get metadata
         metadata_url = META_DATA_URL_TEMPLATE % video_id

-        metadata_text = self._download_webpage(metadata_url, video_id)
-        metadata = xml.etree.ElementTree.fromstring(metadata_text.encode('utf-8'))
+        metadata = self._download_xml(metadata_url, video_id)

 
         # extract values from metadata
         url_flv_el = metadata.find('url_flv')
         if url_flv_el is None:
 
         # extract values from metadata
         url_flv_el = metadata.find('url_flv')
         if url_flv_el is None:

-            raise ExtractorError(u'Unable to extract download url')
+            raise ExtractorError('Unable to extract download url')

         video_url = url_flv_el.text
         video_url = url_flv_el.text

-        extension = os.path.splitext(video_url)[1][1:]

         title_el = metadata.find('title')
         if title_el is None:
         title_el = metadata.find('title')
         if title_el is None:

-            raise ExtractorError(u'Unable to extract title')
+            raise ExtractorError('Unable to extract title')

         title = title_el.text
         format_id_el = metadata.find('format_id')
         if format_id_el is None:
         title = title_el.text
         format_id_el = metadata.find('format_id')
         if format_id_el is None:


@@ -52,13 +61,12 @@ class MySpassIE(InfoExtractor):
             thumbnail = imagePreview_el.text
         else:
             thumbnail = None
             thumbnail = imagePreview_el.text
         else:
             thumbnail = None

-        info = {
+
+        return {

             'id': video_id,
             'url': video_url,
             'title': title,
             'id': video_id,
             'url': video_url,
             'title': title,

-            'ext': extension,

             'format': format,
             'thumbnail': thumbnail,
             'format': format,
             'thumbnail': thumbnail,

-            'description': description
+            'description': description,

         }
         }

-        return [info]