X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffoxnews.py;h=dc0662f74ce5a84d59aa94333ee14d56a592cda2;hb=4c76aa06665621c7689938afd7bbdbc797b5c7ea;hp=3e9a6a08c6de01774719dedc45d782c05adc1d4a;hpb=2cdbc06a1f9dfda4079b2529aa51089650715466;p=youtube-dl

diff --git a/youtube_dl/extractor/foxnews.py b/youtube_dl/extractor/foxnews.py
index 3e9a6a08c..dc0662f74 100644
--- a/youtube_dl/extractor/foxnews.py
+++ b/youtube_dl/extractor/foxnews.py
@@ -6,8 +6,8 @@ from .amp import AMPIE
 from .common import InfoExtractor
 
 
-class FoxNewsVideoIE(AMPIE):
-    IE_NAME = 'foxnews:video'
+class FoxNewsIE(AMPIE):
+    IE_NAME = 'foxnews'
     IE_DESC = 'Fox News and Fox Business Video'
     _VALID_URL = r'https?://(?P<host>video\.(?:insider\.)?fox(?:news|business)\.com)/v/(?:video-embed\.html\?video_id=)?(?P<id>\d+)'
     _TESTS = [
@@ -22,7 +22,7 @@ class FoxNewsVideoIE(AMPIE):
                 'duration': 265,
                 'timestamp': 1304411491,
                 'upload_date': '20110503',
-                'thumbnail': 're:^https?://.*\.jpg$',
+                'thumbnail': r're:^https?://.*\.jpg$',
             },
         },
         {
@@ -36,7 +36,7 @@ class FoxNewsVideoIE(AMPIE):
                 'duration': 292,
                 'timestamp': 1417662047,
                 'upload_date': '20141204',
-                'thumbnail': 're:^https?://.*\.jpg$',
+                'thumbnail': r're:^https?://.*\.jpg$',
             },
             'params': {
                 # m3u8 download
@@ -67,9 +67,9 @@ class FoxNewsVideoIE(AMPIE):
         return info
 
 
-class FoxNewsIE(InfoExtractor):
+class FoxNewsArticleIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?foxnews\.com/(?!v)([^/]+/)+(?P<id>[a-z-]+)'
-    IE_NAME = 'foxnews'
+    IE_NAME = 'foxnews:article'
 
     _TEST = {
         'url': 'http://www.foxnews.com/politics/2016/09/08/buzz-about-bud-clinton-camp-denies-claims-wore-earpiece-at-forum.html',
@@ -93,7 +93,7 @@ class FoxNewsIE(InfoExtractor):
             webpage, 'video ID', group='id')
         return self.url_result(
             'http://video.foxnews.com/v/' + video_id,
-            FoxNewsVideoIE.ie_key())
+            FoxNewsIE.ie_key())
 
 
 class FoxNewsInsiderIE(InfoExtractor):
@@ -111,13 +111,13 @@ class FoxNewsInsiderIE(InfoExtractor):
             'description': 'Is campus censorship getting out of control?',
             'timestamp': 1472168725,
             'upload_date': '20160825',
-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
         },
-        'add_ie': [FoxNewsVideoIE.ie_key()],
+        'add_ie': [FoxNewsIE.ie_key()],
     }
 
     def _real_extract(self, url):
@@ -132,7 +132,7 @@ class FoxNewsInsiderIE(InfoExtractor):
 
         return {
             '_type': 'url_transparent',
-            'ie_key': FoxNewsVideoIE.ie_key(),
+            'ie_key': FoxNewsIE.ie_key(),
             'url': embed_url,
             'display_id': display_id,
             'title': title,