diff options
| author | Sergey M․ <[email protected]> | 2016-01-01 02:22:26 +0600 |
|---|---|---|
| committer | Sergey M․ <[email protected]> | 2016-01-01 02:22:26 +0600 |
| commit | 8f7c4f7d2ec712e890519aa7133b0d6dc5ee778b (patch) | |
| tree | 40e2a1083f79f58043a3c81e4d309ef1a383b8f0 /youtube_dl | |
| parent | 0416006a3051b15e4bebbb096960ca4fb8ffd0a9 (diff) | |
| parent | 7f9134fb2db5559124a0f658bacb6bad54261043 (diff) | |
| download | youtube-dl-8f7c4f7d2ec712e890519aa7133b0d6dc5ee778b.tar.gz youtube-dl-8f7c4f7d2ec712e890519aa7133b0d6dc5ee778b.zip | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/tvland.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/youtube_dl/extractor/tvland.py b/youtube_dl/extractor/tvland.py index 7f049e076..b73279dec 100644 --- a/youtube_dl/extractor/tvland.py +++ b/youtube_dl/extractor/tvland.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from .mtv import MTVIE +from .mtv import MTVServicesInfoExtractor -class TVLandIE(MTVIE): +class TVLandIE(MTVServicesInfoExtractor): IE_NAME = 'tvland.com' _VALID_URL = r'https?://(?:www\.)?tvland\.com/(?:video-clips|episodes)/(?P<id>[^/?#.]+)' - _FEED_URL = 'http://www.tvland.com/feeds/mrss/?uri=' + _FEED_URL = 'http://www.tvland.com/feeds/mrss/' _TESTS = [{ 'url': 'http://www.tvland.com/episodes/hqhps2/everybody-loves-raymond-the-invasion-ep-048', 'playlist': [ @@ -62,9 +62,3 @@ class TVLandIE(MTVIE): 'description': 'md5:7d192f56ca8d958645c83f0de8ef0269' }, }] - - def _real_extract(self, url): - video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) - mgid = self._search_regex(r'data-mgid="([^"]+)"', webpage, 'mgid') - return self._get_videos_info_from_url(self._FEED_URL + mgid, video_id) |