Merge tag 'upstream/2013.12.23'

[youtubedl] / youtube_dl / extractor / flickr.py

diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py
index 80d96baf739522b97f933878faa8a4083a0e8959..e1d2f0526a42169fbbba96789a413d3d20fec6a6 100644 (file)
--- 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"""
 
 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',
     _TEST = {
         u'url': u'http://www.flickr.com/photos/forestwander-nature-pictures/5645318632/in/photostream/',
         u'file': u'5645318632.mp4',