projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nrk] Fix test checksum
[youtube-dl]
/
youtube_dl
/
extractor
/
subtitles.py
diff --git
a/youtube_dl/extractor/subtitles.py
b/youtube_dl/extractor/subtitles.py
index 4b4c5235d09ea8a6f75b7d182abf87bfc573557f..db33745c14472f7f3e7749978585f0b2b2c53af2 100644
(file)
--- a/
youtube_dl/extractor/subtitles.py
+++ b/
youtube_dl/extractor/subtitles.py
@@
-62,10
+62,13
@@
class SubtitlesInfoExtractor(InfoExtractor):
subtitles[sub_lang] = subtitle
return subtitles
subtitles[sub_lang] = subtitle
return subtitles
+ def _download_subtitle_url(self, sub_lang, url):
+ return self._download_webpage(url, None, note=False)
+
def _request_subtitle_url(self, sub_lang, url):
""" makes the http request for the subtitle """
try:
def _request_subtitle_url(self, sub_lang, url):
""" makes the http request for the subtitle """
try:
- sub = self._download_
webpage(url, None, note=False
)
+ sub = self._download_
subtitle_url(sub_lang, url
)
except ExtractorError as err:
self._downloader.report_warning(u'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))
return
except ExtractorError as err:
self._downloader.report_warning(u'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))
return
@@
-79,7
+82,11
@@
class SubtitlesInfoExtractor(InfoExtractor):
returns {sub_lang: url} or {} if not available
Must be redefined by the subclasses
"""
returns {sub_lang: url} or {} if not available
Must be redefined by the subclasses
"""
- pass
+
+ # By default, allow implementations to simply pass in the result
+ assert isinstance(webpage, dict), \
+ '_get_available_subtitles not implemented'
+ return webpage
def _get_available_automatic_caption(self, video_id, webpage):
"""
def _get_available_automatic_caption(self, video_id, webpage):
"""