From: Jaime Marquínez Ferrándiz Date: Wed, 11 Sep 2013 13:51:04 +0000 (+0200) Subject: [subtitles] rename SubitlesIE to SubtitlesInfoExtractor X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=54d39d8b2f7a9fe148a24dd2785108b7d3823d9d;p=youtube-dl [subtitles] rename SubitlesIE to SubtitlesInfoExtractor Otherwise it can be automatically detected as a IE ready for use. --- diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py index c7bcf6e8e..d73023b9e 100644 --- a/youtube_dl/extractor/dailymotion.py +++ b/youtube_dl/extractor/dailymotion.py @@ -4,7 +4,7 @@ import itertools import socket from .common import InfoExtractor -from .subtitles import NoAutoSubtitlesIE +from .subtitles import NoAutoSubtitlesInfoExtractor from ..utils import ( compat_http_client, @@ -18,7 +18,7 @@ from ..utils import ( ) -class DailymotionIE(NoAutoSubtitlesIE): +class DailymotionIE(NoAutoSubtitlesInfoExtractor): """Information Extractor for Dailymotion""" _VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/(?:embed/)?video/([^/]+)' diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py index c10cdf266..8953d6789 100644 --- a/youtube_dl/extractor/subtitles.py +++ b/youtube_dl/extractor/subtitles.py @@ -10,7 +10,7 @@ from ..utils import ( ) -class SubtitlesIE(InfoExtractor): +class SubtitlesInfoExtractor(InfoExtractor): def _list_available_subtitles(self, video_id): """ outputs the available subtitles for the video """ @@ -72,7 +72,7 @@ class SubtitlesIE(InfoExtractor): pass -class NoAutoSubtitlesIE(SubtitlesIE): +class NoAutoSubtitlesInfoExtractor(SubtitlesInfoExtractor): """ A subtitle class for the servers that don't support auto-captions""" def _request_automatic_caption(self, video_id, webpage): diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 8102f6d24..0476f113e 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -7,7 +7,7 @@ import socket import itertools from .common import InfoExtractor, SearchInfoExtractor -from .subtitles import SubtitlesIE +from .subtitles import SubtitlesInfoExtractor from ..utils import ( compat_http_client, compat_parse_qs,