summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-25 17:16:38 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-25 17:16:38 +0200
commitdb241e86450bd0cce9bac6f5717776ae1f526382 (patch)
tree7e55444c83a19f05760ef959a185a878f84e83e1
parentead28ff30ad3bf46e522a10c1be41e741e82dfe4 (diff)
downloadyoutube-dl-db241e86450bd0cce9bac6f5717776ae1f526382.tar.gz
youtube-dl-db241e86450bd0cce9bac6f5717776ae1f526382.tar.xz
youtube-dl-db241e86450bd0cce9bac6f5717776ae1f526382.zip
Add encoding to jukebox IE and simplify it a little bit
-rw-r--r--youtube_dl/extractor/jukebox.py4
1 files changed, 1 insertions, 3 deletions
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'<h1 class="inline">(?P<title>[^<]+)</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)