X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fnewgrounds.py;h=2ef80bce02a8ec95e1a748cbcd27ee1631aeca59;hb=a6387bfd3cc65d8780bb4d6272b51c6268b45988;hp=f316b92722764495289cf58a841a15bd063d8b1b;hpb=1ef80b55ddf05d7fe2bcba08c414aa10c524870d;p=youtube-dl

diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index f316b9272..2ef80bce0 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -4,15 +4,16 @@ import re
 from .common import InfoExtractor
 from ..utils import determine_ext
 
+
 class NewgroundsIE(InfoExtractor):
     _VALID_URL = r'(?:https?://)?(?:www\.)?newgrounds\.com/audio/listen/(?P<id>\d+)'
     _TEST = {
         u'url': u'http://www.newgrounds.com/audio/listen/549479',
         u'file': u'549479.mp3',
-        u'md5': u'2924d938f60415cd7afbe7ae9042a99e',
+        u'md5': u'fe6033d297591288fa1c1f780386f07a',
         u'info_dict': {
             u"title": u"B7 - BusMode",
-            u"uploader" : u"Burn7",
+            u"uploader": u"Burn7",
         }
     }
 
@@ -21,17 +22,17 @@ class NewgroundsIE(InfoExtractor):
         music_id = mobj.group('id')
         webpage = self._download_webpage(url, music_id)
         
-        title = self._html_search_regex(r',"name":"([^"]+)",', webpage, 'music title', flags=re.DOTALL)
-        uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, 'music uploader', flags=re.DOTALL)
+        title = self._html_search_regex(r',"name":"([^"]+)",', webpage, u'music title')
+        uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, u'music uploader')
         
-        music_url_json_string = '{"url":"' + self._html_search_regex(r'{"url":"([^"]+)",', webpage, 'music url', flags=re.DOTALL) + '"}'
+        music_url_json_string = self._html_search_regex(r'({"url":"[^"]+"),', webpage, u'music url') + '}'
         music_url_json = json.loads(music_url_json_string)
         music_url = music_url_json['url']
 
-        return [{
+        return {
             'id':       music_id,
-            'title':    title,            
+            'title':    title,
             'url':      music_url,
             'uploader': uploader,
             'ext':      determine_ext(music_url),
-        }]
+        }