aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-03-09 19:15:33 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-03-09 19:15:33 +0100
commit75d06db9fcddb184f1011c4aad8a6e02dda0f314 (patch)
tree67b46f38ce774ba0a5d482c7e2636ee56c5696ca /youtube_dl
parent439a1fffcbe875efc96d86281fafb5a53afdfcc2 (diff)
parent264b86f9b4f96b6c1605094da3a438a3aeb29dc3 (diff)
Merge branch 'pornhub_unquote_password' of github.com:MikeCol/youtube-dl
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/pornhub.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index fdda69f33..6d1ffe676 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/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)))
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))
formats = []