pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-03-17 13:32:21 +09:00
Code Issues Projects Releases Wiki Activity

used the fix for python 3 provided by @jaimeMF

Browse Source
This commit is contained in:
M.Yasoob Khalid 2013-06-06 01:00:24 +05:00
parent b8e189f1de
commit fd133bfffa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/InfoExtractors.py
View File

@ -4509,13 +4509,13 @@ class HypemIE(InfoExtractor):
list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',html) list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',html)
html_tracks = list_data.group(1) html_tracks = list_data.group(1)
if html_tracks is None: if html_tracks is None:
tracks = track_list tracks = track_list
try: try:
track_list = json.loads(html_tracks) track_list = json.loads(html_tracks)
tracks = track_list[u'tracks'] tracks = track_list[u'tracks']
except ValueError: except ValueError:
self.to_screen("Hypemachine contained invalid JSON.") self.to_screen("Hypemachine contained invalid JSON.")
tracks = track_list tracks = track_list
for track in tracks: for track in tracks:
key = track[u"key"] key = track[u"key"]
@ -4529,6 +4529,7 @@ class HypemIE(InfoExtractor):
response = compat_urllib_request.urlopen(request) response = compat_urllib_request.urlopen(request)
song_data_json = response.read() song_data_json = response.read()
response.close() response.close()
(song_data_json, response) = self._download_webpage_handle(request, id, u'Downloading webpage with the url')
song_data = json.loads(song_data_json) song_data = json.loads(song_data_json)
final_url = song_data[u"url"] final_url = song_data[u"url"]
return [{ return [{