aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/dailymotion.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-09-11 16:24:47 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-09-11 16:24:47 +0200
commit7fad1c6328b02ba9f23d37f374a05255abfe38a6 (patch)
treef8e258ce98f84db16c9521092135051082d00cb0 /youtube_dl/extractor/dailymotion.py
parentd82134c3395c0912157c7ccae9f21d4b3375910b (diff)
downloadyoutube-dl-7fad1c6328b02ba9f23d37f374a05255abfe38a6.zip
youtube-dl-7fad1c6328b02ba9f23d37f374a05255abfe38a6.tar.gz
youtube-dl-7fad1c6328b02ba9f23d37f374a05255abfe38a6.tar.bz2
[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/dailymotion.py')
-rw-r--r--youtube_dl/extractor/dailymotion.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index abd6a36..360113f 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -1,14 +1,11 @@
import re
import json
import itertools
-import socket
from .common import InfoExtractor
from .subtitles import SubtitlesInfoExtractor
from ..utils import (
- compat_http_client,
- compat_urllib_error,
compat_urllib_request,
compat_str,
get_element_by_attribute,
@@ -98,10 +95,11 @@ class DailymotionIE(SubtitlesInfoExtractor):
}]
def _get_available_subtitles(self, video_id):
- request = compat_urllib_request.Request('https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id)
try:
- sub_list = compat_urllib_request.urlopen(request).read().decode('utf-8')
- except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
+ sub_list = self._download_webpage(
+ 'https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id,
+ video_id, note=False)
+ except ExtractorError as err:
self._downloader.report_warning(u'unable to download video subtitles: %s' % compat_str(err))
return {}
info = json.loads(sub_list)