commit c0f6aa876ff3fc2fafe81e2f2cdd323e789559e0
parent d93bdee9a67c0203efd439684b269d0e1a805827
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 4 Oct 2013 11:14:20 +0200
Merge remote-tracking branch 'origin/master'
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py
@@ -9,7 +9,7 @@ from ..utils import (
class FlickrIE(InfoExtractor):
"""Information Extractor for Flickr videos"""
- _VALID_URL = r'(?:https?://)?(?:www\.)?flickr\.com/photos/(?P<uploader_id>[\w\-_@]+)/(?P<id>\d+).*'
+ _VALID_URL = r'(?:https?://)?(?:www\.|secure\.)?flickr\.com/photos/(?P<uploader_id>[\w\-_@]+)/(?P<id>\d+).*'
_TEST = {
u'url': u'http://www.flickr.com/photos/forestwander-nature-pictures/5645318632/in/photostream/',
u'file': u'5645318632.mp4',