浏览代码

Merge branch 'pornhub_unquote_password' of github.com:MikeCol/youtube-dl

Jaime Marquínez Ferrándiz 11 年之前
父节点
当前提交
75d06db9fc
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      youtube_dl/extractor/pornhub.py

+ 1 - 1
youtube_dl/extractor/pornhub.py

@@ -44,7 +44,7 @@ class PornHubIE(InfoExtractor):
 
 
         video_urls = list(map(compat_urllib_parse.unquote , re.findall(r'"quality_[0-9]{3}p":"([^"]+)', webpage)))
         video_urls = list(map(compat_urllib_parse.unquote , re.findall(r'"quality_[0-9]{3}p":"([^"]+)', webpage)))
         if webpage.find('"encrypted":true') != -1:
         if webpage.find('"encrypted":true') != -1:
-            password = self._html_search_regex(r'"video_title":"([^"]+)', webpage, 'password').replace('+', ' ')
+            password = compat_urllib_request.unquote(self._html_search_regex(r'"video_title":"([^"]+)', webpage, 'password').replace('+', ' '))
             video_urls = list(map(lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), video_urls))
             video_urls = list(map(lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), video_urls))
 
 
         formats = []
         formats = []