diff options
| -rw-r--r-- | youtube_dl/extractor/newgrounds.py | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py index 2ef80bce0..5cb83ba14 100644 --- a/youtube_dl/extractor/newgrounds.py +++ b/youtube_dl/extractor/newgrounds.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import json import re @@ -8,12 +10,12 @@ 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", } } @@ -22,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, u'music title') - uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, u'music uploader') + title = self._html_search_regex( + r',"name":"([^"]+)",', webpage, 'music title') + uploader = self._html_search_regex( + r',"artist":"([^"]+)",', webpage, 'music uploader') - music_url_json_string = self._html_search_regex(r'({"url":"[^"]+"),', webpage, u'music url') + '}' + 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, + 'id': music_id, + 'title': title, + 'url': music_url, 'uploader': uploader, - 'ext': determine_ext(music_url), } |