Imported Upstream version 2014.01.17.2

[youtubedl] / youtube_dl / extractor / subtitles.py

diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py
index 90de7de3a709d4385b29e62d44ae1e82349d883e..4b4c5235d09ea8a6f75b7d182abf87bfc573557f 100644 (file)
--- a/youtube_dl/extractor/subtitles.py
+++ b/youtube_dl/extractor/subtitles.py
@@ -12,9 +12,9 @@ class SubtitlesInfoExtractor(InfoExtractor):
         return any([self._downloader.params.get('writesubtitles', False),
                     self._downloader.params.get('writeautomaticsub')])
 
         return any([self._downloader.params.get('writesubtitles', False),
                     self._downloader.params.get('writeautomaticsub')])
 

-    def _list_available_subtitles(self, video_id, webpage=None):
+    def _list_available_subtitles(self, video_id, webpage):

         """ outputs the available subtitles for the video """
         """ outputs the available subtitles for the video """

-        sub_lang_list = self._get_available_subtitles(video_id)
+        sub_lang_list = self._get_available_subtitles(video_id, webpage)

         auto_captions_list = self._get_available_automatic_caption(video_id, webpage)
         sub_lang = ",".join(list(sub_lang_list.keys()))
         self.to_screen(u'%s: Available subtitles for video: %s' %
         auto_captions_list = self._get_available_automatic_caption(video_id, webpage)
         sub_lang = ",".join(list(sub_lang_list.keys()))
         self.to_screen(u'%s: Available subtitles for video: %s' %


@@ -23,7 +23,7 @@ class SubtitlesInfoExtractor(InfoExtractor):
         self.to_screen(u'%s: Available automatic captions for video: %s' %
                        (video_id, auto_lang))
 
         self.to_screen(u'%s: Available automatic captions for video: %s' %
                        (video_id, auto_lang))
 

-    def extract_subtitles(self, video_id, video_webpage=None):
+    def extract_subtitles(self, video_id, webpage):

         """
         returns {sub_lang: sub} ,{} if subtitles not found or None if the
         subtitles aren't requested.
         """
         returns {sub_lang: sub} ,{} if subtitles not found or None if the
         subtitles aren't requested.


@@ -32,9 +32,9 @@ class SubtitlesInfoExtractor(InfoExtractor):
             return None
         available_subs_list = {}
         if self._downloader.params.get('writeautomaticsub', False):
             return None
         available_subs_list = {}
         if self._downloader.params.get('writeautomaticsub', False):

-            available_subs_list.update(self._get_available_automatic_caption(video_id, video_webpage))
+            available_subs_list.update(self._get_available_automatic_caption(video_id, webpage))

         if self._downloader.params.get('writesubtitles', False):
         if self._downloader.params.get('writesubtitles', False):

-            available_subs_list.update(self._get_available_subtitles(video_id))
+            available_subs_list.update(self._get_available_subtitles(video_id, webpage))

 
         if not available_subs_list:  # error, it didn't get the available subtitles
             return {}
 
         if not available_subs_list:  # error, it didn't get the available subtitles
             return {}


@@ -74,7 +74,7 @@ class SubtitlesInfoExtractor(InfoExtractor):
             return
         return sub
 
             return
         return sub
 

-    def _get_available_subtitles(self, video_id):
+    def _get_available_subtitles(self, video_id, webpage):

         """
         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