diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-28 03:35:52 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-28 03:35:52 +0100 |
| commit | 218c15ab5935082f3e5c8589f6eaf0e437919a5d (patch) | |
| tree | 8c75a8cb4735784f2e57edaeee6dafcf941ee523 | |
| parent | 17ab4d3b5e3075d32a0a93422e40f61ef4919d7d (diff) | |
| parent | 9e8ee5455332a524b63a24af7542c04cc8729549 (diff) | |
Merge remote-tracking branch 'mike/tumblr-url'
| -rw-r--r-- | youtube_dl/extractor/tumblr.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index f7bc77c48..544369068 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -9,7 +9,7 @@ from ..utils import ( class TumblrIE(InfoExtractor): - _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/((post)|(video))/(?P<id>\d*)/(.*?)' + _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/((post)|(video))/(?P<id>\d*)($|/)' _TEST = { 'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', 'file': '54196191430.mp4', |