diff options
| author | Sergey M. <dstftw@gmail.com> | 2014-10-31 18:25:22 +0500 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2014-10-31 18:25:22 +0500 |
| commit | 9a4bf889f925c1477eb9198f162d155f4f8be930 (patch) | |
| tree | 4f810ea15c6365c576419ca4e2659cb85328cb61 /youtube_dl/extractor | |
| parent | 0d2c141865389e8124353e0c88ea99da39058692 (diff) | |
| parent | 2a834bdb21b1a747ba91b27a582aa48e8f28ec0b (diff) | |
Merge pull request #4069 from anovicecodemonkey/support_funnyordie_articles_urls
[FunnyOrDie] Add support for "/articles/" URLs
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index ec6d96ada..8ffcfca3b 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -8,7 +8,7 @@ from ..utils import ExtractorError class FunnyOrDieIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])' + _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|articles|videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])' _TESTS = [{ 'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version', 'md5': 'bcd81e0c4f26189ee09be362ad6e6ba9', |