From: Philipp Hagemeister Date: Tue, 25 Jun 2013 15:16:38 +0000 (+0200) Subject: Add encoding to jukebox IE and simplify it a little bit X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=db241e86450bd0cce9bac6f5717776ae1f526382;p=youtube-dl Add encoding to jukebox IE and simplify it a little bit --- diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py index 5eb255bf7..fe726412f 100644 --- a/youtube_dl/extractor/jukebox.py +++ b/youtube_dl/extractor/jukebox.py @@ -1,3 +1,4 @@ +# coding: utf-8 import re from .common import InfoExtractor @@ -13,12 +14,9 @@ class JukeboxIE(InfoExtractor): _TITLE = r'

(?P[^<]+)</h1>.*<span id="infos_article_artist">(?P<artist>[^<]+)</span>' _NOT_AVAILABLE = r'<span>Este video no está disponible por el momento [!]</span>' _IS_YOUTUBE = r'config":{"file":"(?P<youtube_url>http:[\\][/][\\][/]www[.]youtube[.]com[\\][/]watch[?]v=[^"]+)"' - IE_NAME = u'jukebox' def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - if mobj is None: - raise ExtractorError(u'Invalid URL: %s' % url) video_id = mobj.group('video_id') html = self._download_webpage(url, video_id)