diff options
author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-11 16:24:47 +0200 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-09-11 16:24:47 +0200 |
commit | 7fad1c6328b02ba9f23d37f374a05255abfe38a6 (patch) | |
tree | f8e258ce98f84db16c9521092135051082d00cb0 /youtube_dl/extractor/subtitles.py | |
parent | d82134c3395c0912157c7ccae9f21d4b3375910b (diff) |
[subtitles] Use self._download_webpage for extracting the subtitles
It raises ExtractorError for the same exceptions we have to catch.
Diffstat (limited to 'youtube_dl/extractor/subtitles.py')
-rw-r--r-- | youtube_dl/extractor/subtitles.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py index 5ae8b3b16..9a3c54b65 100644 --- a/youtube_dl/extractor/subtitles.py +++ b/youtube_dl/extractor/subtitles.py @@ -1,12 +1,8 @@ -import socket - from .common import InfoExtractor from ..utils import ( - compat_http_client, - compat_urllib_error, - compat_urllib_request, compat_str, + ExtractorError, ) @@ -52,8 +48,8 @@ class SubtitlesInfoExtractor(InfoExtractor): def _request_subtitle_url(self, sub_lang, url): """ makes the http request for the subtitle """ try: - sub = compat_urllib_request.urlopen(url).read().decode('utf-8') - except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: + sub = self._download_webpage(url, None, note=False) + except ExtractorError as err: self._downloader.report_warning(u'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err))) return if not sub: @@ -88,5 +84,3 @@ class SubtitlesInfoExtractor(InfoExtractor): elif self._downloader.params.get('writeautomaticsub', False): video_subtitles = self._request_automatic_caption(video_id, video_webpage) return video_subtitles - - |