aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/dailymotion.py
diff options
context:
space:
mode:
authorIsmaël Mejía <iemejia@gmail.com>2013-11-02 19:50:45 +0100
committerIsmaël Mejía <iemejia@gmail.com>2013-11-02 19:50:45 +0100
commit38db46794f3ccfef09094db9b411e55acd4c1a3d (patch)
tree8c184e42a5f9710c5bad78a080038a4885800ca8 /youtube_dl/extractor/dailymotion.py
parentaa2484e390d8a5e74d740fda61b4062a4a8c1d0e (diff)
parenta9a3876d55be943a7eaf505cbeb8fb862514db6c (diff)
downloadyoutube-dl-38db46794f3ccfef09094db9b411e55acd4c1a3d.zip
youtube-dl-38db46794f3ccfef09094db9b411e55acd4c1a3d.tar.gz
youtube-dl-38db46794f3ccfef09094db9b411e55acd4c1a3d.tar.bz2
Merge branch 'ted_subtitles'
Diffstat (limited to 'youtube_dl/extractor/dailymotion.py')
-rw-r--r--youtube_dl/extractor/dailymotion.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index 355b4ed..e87690f 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -141,9 +141,9 @@ class DailymotionIE(DailymotionBaseInfoExtractor, SubtitlesInfoExtractor):
raise ExtractorError(u'Unable to extract video URL')
# subtitles
- video_subtitles = self.extract_subtitles(video_id)
+ video_subtitles = self.extract_subtitles(video_id, webpage)
if self._downloader.params.get('listsubtitles', False):
- self._list_available_subtitles(video_id)
+ self._list_available_subtitles(video_id, webpage)
return
return {
@@ -157,7 +157,7 @@ class DailymotionIE(DailymotionBaseInfoExtractor, SubtitlesInfoExtractor):
'age_limit': age_limit,
}
- def _get_available_subtitles(self, video_id):
+ def _get_available_subtitles(self, video_id, webpage):
try:
sub_list = self._download_webpage(
'https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id,