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

trying to rebase mt code

Browse Source
This commit is contained in:
M.Yasoob Khalid 2013-06-06 12:37:57 +05:00
parent fa71aa397a
commit e896e41f9c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/InfoExtractors.py
View File

@ -4494,14 +4494,12 @@ class HypemIE(InfoExtractor):
data = {'ax':1 , data = {'ax':1 ,
'ts': time.time() 'ts': time.time()
} }
<<<<<<< HEAD
id = mobj.group(1) id = mobj.group(1)
data_encoded = compat_urllib_parse.urlencode(data) data_encoded = compat_urllib_parse.urlencode(data)
complete_url = url + "?"+data_encoded complete_url = url + "?"+data_encoded
request = compat_urllib_request.Request(complete_url) request = compat_urllib_request.Request(complete_url)
response,urlh = self._download_webpage_handle(request, id, u'Downloading webpage with the url') response,urlh = self._download_webpage_handle(request, id, u'Downloading webpage with the url')
cookie = urlh.headers.get('Set-Cookie', '') cookie = urlh.headers.get('Set-Cookie', '')
=======
data_encoded = compat_urllib_parse.urlencode(data) data_encoded = compat_urllib_parse.urlencode(data)
complete_url = url + "?"+data_encoded complete_url = url + "?"+data_encoded
request = compat_urllib_request.Request(complete_url) request = compat_urllib_request.Request(complete_url)
@ -4513,7 +4511,6 @@ class HypemIE(InfoExtractor):
#grab the HTML #grab the HTML
html = response.read().decode(encoding) html = response.read().decode(encoding)
response.close() response.close()
>>>>>>> remotes/origin/HEAD
track_list = [] track_list = []
list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',response) list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',response)
html_tracks = list_data.group(1) html_tracks = list_data.group(1)