diff options
| author | Ismael Mejia <iemejia@gmail.com> | 2013-09-11 15:21:09 +0200 |
|---|---|---|
| committer | Ismael Mejia <iemejia@gmail.com> | 2013-09-11 15:21:09 +0200 |
| commit | f8e52269c1a27c28aef606f010e2c64ff9a946d3 (patch) | |
| tree | 922e994ed6b3f74d169be183e0a8250be3650368 /youtube_dl/extractor/youtube.py | |
| parent | cf1dd0c59e8ff4c66130bc47954c415be5db8cc3 (diff) | |
[subtitles] made inheritance hierarchy flat as requested
Diffstat (limited to 'youtube_dl/extractor/youtube.py')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index e71cd62ec..5945eab70 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -24,7 +24,7 @@ from ..utils import ( orderedSet, ) -class YoutubeBaseInfoExtractor(InfoExtractor): +class YoutubeBaseInfoExtractor(SubtitlesIE): """Provide base functions for Youtube extractors""" _LOGIN_URL = 'https://accounts.google.com/ServiceLogin' _LANG_URL = r'https://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1' @@ -131,8 +131,6 @@ class YoutubeBaseInfoExtractor(InfoExtractor): return self._confirm_age() -class YoutubeSubtitlesIE(SubtitlesIE): - def _get_available_subtitles(self, video_id): request = compat_urllib_request.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id) try: @@ -189,7 +187,7 @@ class YoutubeSubtitlesIE(SubtitlesIE): self._downloader.report_warning(err_msg) return {} -class YoutubeIE(YoutubeSubtitlesIE, YoutubeBaseInfoExtractor): +class YoutubeIE(YoutubeBaseInfoExtractor): IE_DESC = u'YouTube.com' _VALID_URL = r"""^ ( |