X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmetacafe.py;h=6436c05a3cd8e3f25499b9ff911de837a6c98207;hb=7e660ac113b5af8f92de2bbc9579426ea3d89581;hp=ac47c5ccbe18dd5775c944293dd123538a320c4d;hpb=391dc3ee0727cf2a5f0a41e573a11c09741d842f;p=youtube-dl diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py index ac47c5ccb..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' @@ -86,7 +86,6 @@ class MetacafeIE(InfoExtractor): ] def report_disclaimer(self): - """Report disclaimer retrieval.""" self.to_screen('Retrieving disclaimer') def _real_initialize(self):