Update upstream source from tag 'upstream/2018.03.14'

[youtubedl] / youtube_dl / extractor / phoenix.py

diff --git a/youtube_dl/extractor/phoenix.py b/youtube_dl/extractor/phoenix.py
index 46cebc0d7b05080491d5f1d32ee8a709b549debc..e435c28e171b9a25d3cc839b7b67a6c0d27e2272 100644 (file)
--- a/youtube_dl/extractor/phoenix.py
+++ b/youtube_dl/extractor/phoenix.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-from .common import InfoExtractor
-from .zdf import extract_from_xml_url
+from .dreisat import DreiSatIE

 
 
 
 

-class PhoenixIE(InfoExtractor):
+class PhoenixIE(DreiSatIE):
+    IE_NAME = 'phoenix.de'

     _VALID_URL = r'''(?x)https?://(?:www\.)?phoenix\.de/content/
         (?:
             phoenix/die_sendungen/(?:[^/]+/)?
     _VALID_URL = r'''(?x)https?://(?:www\.)?phoenix\.de/content/
         (?:
             phoenix/die_sendungen/(?:[^/]+/)?


@@ -41,5 +41,5 @@ class PhoenixIE(InfoExtractor):
             r'<div class="phx_vod" id="phx_vod_([0-9]+)"',
             webpage, 'internal video ID')
 
             r'<div class="phx_vod" id="phx_vod_([0-9]+)"',
             webpage, 'internal video ID')
 

-        api_url = 'http://www.phoenix.de/php/zdfplayer-v1.3/data/beitragsDetails.php?ak=web&id=%s' % internal_id
-        return extract_from_xml_url(self, video_id, api_url)
+        api_url = 'http://www.phoenix.de/php/mediaplayer/data/beitrags_details.php?ak=web&id=%s' % internal_id
+        return self.extract_from_xml_url(video_id, api_url)