mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 03:27:06 -05:00 
			
		
		
		
	Merge remote-tracking branch 'mike/tumblr-url'
This commit is contained in:
		@@ -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',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user