Merge branch 'master' of github.com:rg3/youtube-dl

diff --git a/youtube_dl/extractor/jukebox.py b/youtube_dl/extractor/jukebox.py
index f06dcb05ed638c4243b57a8f7fc98e606aaf5325..9b553b9fa52873739b0d4ecb4e3927e1beff929e 100644 (file)
--- a/youtube_dl/extractor/jukebox.py
+++ b/youtube_dl/extractor/jukebox.py
@@ -14,7 +14,7 @@ class JukeboxIE(InfoExtractor):
     _VALID_URL = r'^http://www\.jukebox?\..+?\/.+[,](?P<video_id>[a-z0-9\-]+)\.html'
     _TEST = {
         'url': 'http://www.jukebox.es/kosheen/videoclip,pride,r303r.html',
-        'md5': '5dc6477e74b1e37042ac5acedd8413e5',
+        'md5': '1574e9b4d6438446d5b7dbcdf2786276',
         'info_dict': {
             'id': 'r303r',
             'ext': 'flv',

diff --git a/youtube_dl/extractor/rutube.py b/youtube_dl/extractor/rutube.py
index 4f7f8cb6d2a57c8cd77f3b4cc5328105bdc2f44a..357edbbdaf88c6c29395aa7878c18f305c79b216 100644 (file)
--- a/youtube_dl/extractor/rutube.py
+++ b/youtube_dl/extractor/rutube.py
@@ -47,7 +47,7 @@ class RutubeIE(InfoExtractor):
         author = video.get('author') or {}
 
         options = self._download_json(
-            'http://rutube.ru/api/play/options/%s/?format=json' %video_id,
+            'http://rutube.ru/api/play/options/%s/?format=json' % video_id,
             video_id, 'Downloading options JSON')
 
         m3u8_url = options['video_balancer'].get('m3u8')