diff options
| author | Jaime Marquínez Ferrándiz <[email protected]> | 2014-01-28 18:37:42 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <[email protected]> | 2014-01-28 18:41:39 +0100 |
| commit | 869baf35659945c755bb901146d456e5c21b425e (patch) | |
| tree | 7655ca91f940432d869132afb23dd7aa9434e83b | |
| parent | e299f6d27f8ba003e22ccbc550309ea60e7229ad (diff) | |
| download | youtube-dl-869baf35659945c755bb901146d456e5c21b425e.tar.gz youtube-dl-869baf35659945c755bb901146d456e5c21b425e.zip | |
[funnyordie] Simplify and use unicode_literals
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 2ccdb7073..7c40e6753 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor @@ -6,13 +8,16 @@ from .common import InfoExtractor class FunnyOrDieIE(InfoExtractor): _VALID_URL = r'^(?:https?://)?(?:www\.)?funnyordie\.com/videos/(?P<id>[0-9a-f]+)/.*$' _TEST = { - u'url': u'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version', - u'file': u'0732f586d7.mp4', - u'md5': u'f647e9e90064b53b6e046e75d0241fbd', - u'info_dict': { - u"description": u"Lyrics changed to match the video. Spoken cameo by Obscurus Lupa (from ThatGuyWithTheGlasses.com). Based on a concept by Dustin McLean (DustFilms.com). Performed, edited, and written by David A. Scott.", - u"title": u"Heart-Shaped Box: Literal Video Version" - } + 'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version', + 'file': '0732f586d7.mp4', + 'md5': 'f647e9e90064b53b6e046e75d0241fbd', + 'info_dict': { + 'description': ('Lyrics changed to match the video. Spoken cameo ' + 'by Obscurus Lupa (from ThatGuyWithTheGlasses.com). Based on a ' + 'concept by Dustin McLean (DustFilms.com). Performed, edited, ' + 'and written by David A. Scott.'), + 'title': 'Heart-Shaped Box: Literal Video Version', + }, } def _real_extract(self, url): @@ -23,13 +28,12 @@ class FunnyOrDieIE(InfoExtractor): video_url = self._search_regex( [r'type="video/mp4" src="(.*?)"', r'src="([^>]*?)" type=\'video/mp4\''], - webpage, u'video URL', flags=re.DOTALL) + webpage, 'video URL', flags=re.DOTALL) - info = { + return { 'id': video_id, 'url': video_url, 'ext': 'mp4', 'title': self._og_search_title(webpage), 'description': self._og_search_description(webpage), } - return [info] |