diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-04 11:14:20 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-04 11:14:20 +0200 |
commit | c0f6aa876ff3fc2fafe81e2f2cdd323e789559e0 (patch) | |
tree | 997d7a54d0f0945dd4164e3226124d85d119193a /youtube_dl | |
parent | d93bdee9a67c0203efd439684b269d0e1a805827 (diff) | |
parent | a90b9fd209f60f66e545565df21c5468d8cf0c81 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl')
-rw-r--r-- | youtube_dl/extractor/flickr.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index 80d96baf7..e1d2f0526 100644 --- 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', |