X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmetacafe.py;h=6436c05a3cd8e3f25499b9ff911de837a6c98207;hb=9c1fc022ae3e1232a31f79dbde1e85783f26fa6d;hp=3176ec2301a1ea467a4abd08108067bf62302faf;hpb=be3b8fa30f9b1fdc47a0f37678fec63fcf321c1d;p=youtube-dl

diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py
index 3176ec230..6436c05a3 100644
--- a/youtube_dl/extractor/metacafe.py
+++ b/youtube_dl/extractor/metacafe.py
@@ -13,7 +13,7 @@ from ..utils import (
 
 
 class MetacafeIE(InfoExtractor):
-    _VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+    _VALID_URL = r'http://(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
     _DISCLAIMER = 'http://www.metacafe.com/family_filter/'
     _FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
     IE_NAME = 'metacafe'
@@ -26,7 +26,7 @@ class MetacafeIE(InfoExtractor):
                 'id': '_aUehQsCQtM',
                 'ext': 'mp4',
                 'upload_date': '20090102',
-                'title': 'The Electric Company | \"Short I\" | PBS KIDS GO!',
+                'title': 'The Electric Company | "Short I" | PBS KIDS GO!',
                 'description': 'md5:2439a8ef6d5a70e380c22f5ad323e5a8',
                 'uploader': 'PBS',
                 'uploader_id': 'PBS'
@@ -70,13 +70,13 @@ class MetacafeIE(InfoExtractor):
         },
         # cbs video
         {
-            'url': 'http://www.metacafe.com/watch/cb-0rOxMBabDXN6/samsung_galaxy_note_2_samsungs_next_generation_phablet/',
+            'url': 'http://www.metacafe.com/watch/cb-8VD4r_Zws8VP/open_this_is_face_the_nation_february_9/',
             'info_dict': {
-                'id': '0rOxMBabDXN6',
+                'id': '8VD4r_Zws8VP',
                 'ext': 'flv',
-                'title': 'Samsung Galaxy Note 2: Samsung\'s next-generation phablet',
-                'description': 'md5:54d49fac53d26d5a0aaeccd061ada09d',
-                'duration': 129,
+                'title': 'Open: This is Face the Nation, February 9',
+                'description': 'md5:8a9ceec26d1f7ed6eab610834cc1a476',
+                'duration': 96,
             },
             'params': {
                 # rtmp download
@@ -86,7 +86,6 @@ class MetacafeIE(InfoExtractor):
     ]
 
     def report_disclaimer(self):
-        """Report disclaimer retrieval."""
         self.to_screen('Retrieving disclaimer')
 
     def _real_initialize(self):