Prepare for upload.

[youtubedl] / youtube_dl / extractor / subtitles.py

diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py
index 4b4c5235d09ea8a6f75b7d182abf87bfc573557f..59a51268d25ed4b0718c67ae91a5e8f07fcfe42c 100644 (file)
--- a/youtube_dl/extractor/subtitles.py
+++ b/youtube_dl/extractor/subtitles.py
@@ -1,7 +1,8 @@
+from __future__ import unicode_literals

 from .common import InfoExtractor
 
 from .common import InfoExtractor
 

+from ..compat import compat_str

 from ..utils import (
 from ..utils import (

-    compat_str,

     ExtractorError,
 )
 
     ExtractorError,
 )
 


@@ -17,10 +18,10 @@ class SubtitlesInfoExtractor(InfoExtractor):
         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()))
         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' %
+        self.to_screen('%s: Available subtitles for video: %s' %

                        (video_id, sub_lang))
         auto_lang = ",".join(auto_captions_list.keys())
                        (video_id, sub_lang))
         auto_lang = ",".join(auto_captions_list.keys())

-        self.to_screen(u'%s: Available automatic captions for video: %s' %
+        self.to_screen('%s: Available automatic captions for video: %s' %

                        (video_id, auto_lang))
 
     def extract_subtitles(self, video_id, webpage):
                        (video_id, auto_lang))
 
     def extract_subtitles(self, video_id, webpage):


@@ -50,8 +51,8 @@ class SubtitlesInfoExtractor(InfoExtractor):
 
             sub_lang_list = {}
             for sub_lang in requested_langs:
 
             sub_lang_list = {}
             for sub_lang in requested_langs:

-                if not sub_lang in available_subs_list:
-                    self._downloader.report_warning(u'no closed captions found in the specified language "%s"' % sub_lang)
+                if sub_lang not in available_subs_list:
+                    self._downloader.report_warning('no closed captions found in the specified language "%s"' % sub_lang)

                     continue
                 sub_lang_list[sub_lang] = available_subs_list[sub_lang]
 
                     continue
                 sub_lang_list[sub_lang] = available_subs_list[sub_lang]
 


@@ -62,15 +63,18 @@ 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:
         except ExtractorError as err:

-            self._downloader.report_warning(u'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))
+            self._downloader.report_warning('unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))

             return
         if not sub:
             return
         if not sub:

-            self._downloader.report_warning(u'Did not fetch video subtitles')
+            self._downloader.report_warning('Did not fetch video subtitles')

             return
         return sub
 
             return
         return sub
 


@@ -79,7 +83,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):
         """


@@ -87,5 +95,5 @@ class SubtitlesInfoExtractor(InfoExtractor):
         Must be redefined by the subclasses that support automatic captions,
         otherwise it will return {}
         """
         Must be redefined by the subclasses that support automatic captions,
         otherwise it will return {}
         """

-        self._downloader.report_warning(u'Automatic Captions not supported by this server')
+        self._downloader.report_warning('Automatic Captions not supported by this server')

         return {}
         return {}