X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/71050031bb901b19a829cc44763bf68e67b1f648..76d85602f8a22ca3817c3a86f4f0e8969c0b02a9:/youtube_dl/extractor/space.py?ds=sidebyside diff --git a/youtube_dl/extractor/space.py b/youtube_dl/extractor/space.py index 0d32a06..c2d0d36 100644 --- a/youtube_dl/extractor/space.py +++ b/youtube_dl/extractor/space.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor @@ -6,16 +8,16 @@ from ..utils import RegexNotFoundError, ExtractorError class SpaceIE(InfoExtractor): - _VALID_URL = r'https?://www\.space\.com/\d+-(?P[^/\.\?]*?)-video.html' + _VALID_URL = r'https?://(?:(?:www|m)\.)?space\.com/\d+-(?P<title>[^/\.\?]*?)-video\.html' _TEST = { - u'add_ie': ['Brightcove'], - u'url': u'http://www.space.com/23373-huge-martian-landforms-detail-revealed-by-european-probe-video.html', - u'info_dict': { - u'id': u'2780937028001', - u'ext': u'mp4', - u'title': u'Huge Martian Landforms\' Detail Revealed By European Probe | Video', - u'description': u'md5:db81cf7f3122f95ed234b631a6ea1e61', - u'uploader': u'TechMedia Networks', + 'add_ie': ['Brightcove'], + 'url': 'http://www.space.com/23373-huge-martian-landforms-detail-revealed-by-european-probe-video.html', + 'info_dict': { + 'id': '2780937028001', + 'ext': 'mp4', + 'title': 'Huge Martian Landforms\' Detail Revealed By European Probe | Video', + 'description': 'md5:db81cf7f3122f95ed234b631a6ea1e61', + 'uploader': 'TechMedia Networks', }, } @@ -31,5 +33,6 @@ class SpaceIE(InfoExtractor): # Other videos works fine with the info from the object brightcove_url = BrightcoveIE._extract_brightcove_url(webpage) if brightcove_url is None: - raise ExtractorError(u'The webpage does not contain a video', expected=True) + raise ExtractorError( + 'The webpage does not contain a video', expected=True) return self.url_result(brightcove_url, BrightcoveIE.ie_key())