Some pep8 style fixes

[youtube-dl] / youtube_dl / extractor / newgrounds.py

diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index e66294adeed2b88969fc36482b195f08f52a30f1..5cb83ba143ba27b072ef9ac80050654c314bc037 100644 (file)
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -1,18 +1,21 @@
+from __future__ import unicode_literals
+
 import json
 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'fe6033d297591288fa1c1f780386f07a',
-        u'info_dict': {
-            u"title": u"B7 - BusMode",
-            u"uploader" : u"Burn7",
+        'url': 'http://www.newgrounds.com/audio/listen/549479',
+        'file': '549479.mp3',
+        'md5': 'fe6033d297591288fa1c1f780386f07a',
+        'info_dict': {
+            "title": "B7 - BusMode",
+            "uploader": "Burn7",
         }
     }
 
@@ -21,17 +24,19 @@ 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, 'music title')
+        uploader = self._html_search_regex(
+            r',"artist":"([^"]+)",', webpage, '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, 'music url') + '}'
         music_url_json = json.loads(music_url_json_string)
         music_url = music_url_json['url']
 
-        return [{
-            'id':       music_id,
-            'title':    title,            
-            'url':      music_url,
+        return {
+            'id': music_id,
+            'title': title,
+            'url': music_url,
             'uploader': uploader,
-            'ext':      determine_ext(music_url),
-        }]
+        }