From: Yen Chi Hsuan Date: Thu, 14 Apr 2016 20:02:23 +0000 (+0800) Subject: [wayofthemaster] Remove extractor X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f2159c9815fa056ca1d4ef4a6d1c31c4847b3d47;p=youtube-dl [wayofthemaster] Remove extractor Now it's using YouTube embeds. --- diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index d9193349d..3148869d9 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -917,7 +917,6 @@ from .vulture import VultureIE from .walla import WallaIE from .washingtonpost import WashingtonPostIE from .wat import WatIE -from .wayofthemaster import WayOfTheMasterIE from .wdr import ( WDRIE, WDRMobileIE, diff --git a/youtube_dl/extractor/wayofthemaster.py b/youtube_dl/extractor/wayofthemaster.py deleted file mode 100644 index af7bb8b49..000000000 --- a/youtube_dl/extractor/wayofthemaster.py +++ /dev/null @@ -1,52 +0,0 @@ -from __future__ import unicode_literals - -import re - -from .common import InfoExtractor - - -class WayOfTheMasterIE(InfoExtractor): - _VALID_URL = r'https?://www\.wayofthemaster\.com/([^/?#]*/)*(?P[^/?#]+)\.s?html(?:$|[?#])' - - _TEST = { - 'url': 'http://www.wayofthemaster.com/hbks.shtml', - 'md5': '5316b57487ada8480606a93cb3d18d24', - 'info_dict': { - 'id': 'hbks', - 'ext': 'mp4', - 'title': 'Intelligent Design vs. Evolution', - }, - } - - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - - webpage = self._download_webpage(url, video_id) - - title = self._search_regex( - r'(.*?)', webpage, 'page title') - - url_base = self._search_regex( - r'