diff options
author | Rogério Brito <rbrito@ime.usp.br> | 2017-05-19 03:21:46 -0300 |
---|---|---|
committer | Rogério Brito <rbrito@ime.usp.br> | 2017-05-19 03:21:46 -0300 |
commit | 532a08904ffbacc5e5ccf99edb660c5f37ddb213 (patch) | |
tree | 12399229cfa94b847a3ba07fcdca2336e5adc5b0 /youtube_dl/extractor/pornhub.py | |
parent | 97a8fc3ae80fb363c69c2e6b8c29b5373ac72aea (diff) | |
parent | d9d7cd0e85dc712461d9185db9df9d6c900a573b (diff) | |
download | youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.zip youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.tar.gz youtube-dl-532a08904ffbacc5e5ccf99edb660c5f37ddb213.tar.bz2 |
Merge tag 'upstream/2017.05.18.1'
Upstream version 2017.05.18.1
Diffstat (limited to 'youtube_dl/extractor/pornhub.py')
-rw-r--r-- | youtube_dl/extractor/pornhub.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index b25f1f1..1dcc8df 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -33,7 +33,7 @@ class PornHubIE(InfoExtractor): _VALID_URL = r'''(?x) https?:// (?: - (?:[a-z]+\.)?pornhub\.com/(?:view_video\.php\?viewkey=|embed/)| + (?:[a-z]+\.)?pornhub\.com/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)| (?:www\.)?thumbzilla\.com/video/ ) (?P<id>[\da-z]+) @@ -97,6 +97,9 @@ class PornHubIE(InfoExtractor): }, { 'url': 'https://www.thumbzilla.com/video/ph56c6114abd99a/horny-girlfriend-sex', 'only_matching': True, + }, { + 'url': 'http://www.pornhub.com/video/show?viewkey=648719015', + 'only_matching': True, }] @staticmethod |