From: remitamine Date: Mon, 11 Apr 2016 13:44:35 +0000 (+0100) Subject: Revert "[openclassroom] Add new extractor(closes #9147)" X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4a903b93a93eb49bb7942cfe62a338cb947f78bc;p=youtube-dl Revert "[openclassroom] Add new extractor(closes #9147)" This reverts commit 13267a2be37371bd3e8aea0bc7549f4ed2465c03. --- diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 21159f5a1..c234ff127 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -544,7 +544,6 @@ from .ooyala import ( OoyalaIE, OoyalaExternalIE, ) -from .openclassroom import OpenClassRoomIE from .openload import OpenloadIE from .ora import OraTVIE from .orf import ( diff --git a/youtube_dl/extractor/openclassroom.py b/youtube_dl/extractor/openclassroom.py deleted file mode 100644 index bbc1af7c9..000000000 --- a/youtube_dl/extractor/openclassroom.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import re - -from .common import InfoExtractor -from ..compat import compat_parse_qs -from ..utils import ( - ExtractorError, - xpath_text, - clean_html, -) - - -class OpenClassRoomIE(InfoExtractor): - _VALID_URL = r'https?://openclassroom\.stanford\.edu/MainFolder/VideoPage\.php\?(?P.*)' - _TEST = { - 'url': 'http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100', - 'md5': '544a9468546059d4e80d76265b0443b8', - 'info_dict': { - 'id': 'intro-environment', - 'ext': 'mp4', - 'title': 'Intro Environment', - 'description': 'md5:7d57306c8649f814ca00bb80dada600e', - } - } - _URL_TEMPLATE = 'http://openclassroom.stanford.edu/MainFolder/courses/%s/videos/%s' - - def _real_extract(self, url): - qs = compat_parse_qs(re.match(self._VALID_URL, url).group('query')) - if not qs.get('course') or not qs.get('video'): - raise ExtractorError('Unsupported URL', expected=True) - video_id = qs['video'][0] - video_doc = self._download_xml( - self._URL_TEMPLATE % (qs['course'][0], video_id + '.xml'), video_id) - return { - 'id': video_id, - 'title': xpath_text(video_doc, 'title', 'title', True), - 'url': self._URL_TEMPLATE % (qs['course'][0], xpath_text( - video_doc, 'videoFile', 'video url', True)), - 'description': clean_html(xpath_text(video_doc, 'text')), - }