From: Sergey M. <dstftw@gmail.com>
Date: Fri, 31 Oct 2014 13:25:22 +0000 (+0500)
Subject: Merge pull request #4069 from anovicecodemonkey/support_funnyordie_articles_urls
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9a4bf889f925c1477eb9198f162d155f4f8be930;hp=0d2c141865389e8124353e0c88ea99da39058692;p=youtube-dl

Merge pull request #4069 from anovicecodemonkey/support_funnyordie_articles_urls

[FunnyOrDie] Add support for "/articles/" URLs
---

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',