diff options
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/extremetube.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/ign.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/yahoo.py | 7 | 
3 files changed, 9 insertions, 12 deletions
diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py index d7fc43287..7612a0364 100644 --- a/youtube_dl/extractor/extremetube.py +++ b/youtube_dl/extractor/extremetube.py @@ -10,7 +10,7 @@ from ..utils import (  class ExtremeTubeIE(InfoExtractor):      _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>extremetube\.com/.*?video/.+?(?P<videoid>[0-9]+))(?:[/?&]|$)' -    _TEST = { +    _TESTS = [{          u'url': u'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',          u'file': u'652431.mp4',          u'md5': u'1fb9228f5e3332ec8c057d6ac36f33e0', @@ -19,7 +19,10 @@ class ExtremeTubeIE(InfoExtractor):              u"uploader": u"unknown",              u"age_limit": 18,          } -    } +    }, { +        'url': 'http://www.extremetube.com/gay/video/abcde-1234', +        'only_matching': True, +    }]      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url) diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py index cfeaa4146..1f42c6d3a 100644 --- a/youtube_dl/extractor/ign.py +++ b/youtube_dl/extractor/ign.py @@ -106,7 +106,7 @@ class OneUPIE(IGNIE):      _DESCRIPTION_RE = r'<div id="vid_summary">(.+?)</div>' -    _TEST = { +    _TESTS = [{          'url': 'http://gamevideos.1up.com/video/id/34976',          'md5': '68a54ce4ebc772e4b71e3123d413163d',          'info_dict': { @@ -115,10 +115,7 @@ class OneUPIE(IGNIE):              'title': 'Sniper Elite V2 - Trailer',              'description': 'md5:5d289b722f5a6d940ca3136e9dae89cf',          } -    } - -    # Override IGN tests -    _TESTS = [] +    }]      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url) diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index e2cf1ae56..4671f49ed 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -104,7 +104,7 @@ class YahooNewsIE(YahooIE):      IE_NAME = 'yahoo:news'      _VALID_URL = r'http://news\.yahoo\.com/video/.*?-(?P<id>\d*?)\.html' -    _TEST = { +    _TESTS = [{          'url': 'http://news.yahoo.com/video/china-moses-crazy-blues-104538833.html',          'md5': '67010fdf3a08d290e060a4dd96baa07b',          'info_dict': { @@ -113,10 +113,7 @@ class YahooNewsIE(YahooIE):              'title': 'China Moses Is Crazy About the Blues',              'description': 'md5:9900ab8cd5808175c7b3fe55b979bed0',          }, -    } - -    # Overwrite YahooIE properties we don't want -    _TESTS = [] +    }]      def _real_extract(self, url):          mobj = re.match(self._VALID_URL, url)  | 
