aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-11-30 03:47:01 +0600
committerSergey M․ <dstftw@gmail.com>2015-11-30 03:47:01 +0600
commitd53a4af1a49413a38d639aeb7f522c4ebff8f5c8 (patch)
tree40906f798ddc01a5ccf26fbab4ed99df8b5c1551 /youtube_dl/extractor
parent2e1b92854000662e554413df0c34c1cbc0d7ffc8 (diff)
[pornhub:playlist] Allow alphanumeric viewkeys (Closes #7695)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/pornhub.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index 965940a4b..08275687d 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -147,7 +147,8 @@ class PornHubPlaylistIE(InfoExtractor):
entries = [
self.url_result('http://www.pornhub.com/%s' % video_url, 'PornHub')
- for video_url in set(re.findall('href="/?(view_video\.php\?viewkey=\d+[^"]*)"', webpage))
+ for video_url in set(re.findall(
+ r'href="/?(view_video\.php\?.*\bviewkey=[\da-z]+[^"]*)"', webpage))
]
playlist = self._parse_json(