Merge pull request #12861 from Tithen-Firion/cbsinteractive-fix

[youtube-dl] / youtube_dl / extractor / fxnetworks.py

diff --git a/youtube_dl/extractor/fxnetworks.py b/youtube_dl/extractor/fxnetworks.py
index 940e7427c06d8a40ab464aa72675082eff0f4db1..629897317be5fbe316639856cec73662c1f8149c 100644 (file)
--- a/youtube_dl/extractor/fxnetworks.py
+++ b/youtube_dl/extractor/fxnetworks.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-from .adobepass import AdobePass
+from .adobepass import AdobePassIE
 from ..utils import (
     update_url_query,
     extract_attributes,
@@ -10,9 +10,9 @@ from ..utils import (
 )
 
 
-class FXNetworksIE(AdobePass):
-    _VALID_URL = r'https?://(?:www\.)?fxnetworks\.com/video/(?P<id>\d+)'
-    _TEST = {
+class FXNetworksIE(AdobePassIE):
+    _VALID_URL = r'https?://(?:www\.)?(?:fxnetworks|simpsonsworld)\.com/video/(?P<id>\d+)'
+    _TESTS = [{
         'url': 'http://www.fxnetworks.com/video/719841347694',
         'md5': '1447d4722e42ebca19e5232ab93abb22',
         'info_dict': {
@@ -26,7 +26,10 @@ class FXNetworksIE(AdobePass):
             'timestamp': 1467844741,
         },
         'add_ie': ['ThePlatform'],
-    }
+    }, {
+        'url': 'http://www.simpsonsworld.com/video/716094019682',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -35,7 +38,7 @@ class FXNetworksIE(AdobePass):
             self.raise_geo_restricted()
         video_data = extract_attributes(self._search_regex(
             r'(<a.+?rel="http://link\.theplatform\.com/s/.+?</a>)', webpage, 'video data'))
-        player_type = self._search_regex(r'playerType\s*=\s*[\'"]([^\'"]+)', webpage, 'player type', fatal=False)
+        player_type = self._search_regex(r'playerType\s*=\s*[\'"]([^\'"]+)', webpage, 'player type', default=None)
         release_url = video_data['rel']
         title = video_data['data-title']
         rating = video_data.get('data-rating')