From c060b774467f499bc946ae024bc9fc4ecfbc6d67 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Mon, 27 Jan 2014 07:36:18 +0100 Subject: [PATCH] [tumblr] Use unicode_literals --- youtube_dl/extractor/tumblr.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index ad5840ca2..abbbb9661 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor @@ -9,11 +11,11 @@ class TumblrIE(InfoExtractor): _VALID_URL = r'http://(?P.*?)\.tumblr\.com/((post)|(video))/(?P\d*)/(.*?)' _TEST = { - u'url': u'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', - u'file': u'54196191430.mp4', - u'md5': u'479bb068e5b16462f5176a6828829767', - u'info_dict': { - u"title": u"tatiana maslany news" + 'url': 'http://tatianamaslanydaily.tumblr.com/post/54196191430/orphan-black-dvd-extra-behind-the-scenes', + 'file': '54196191430.mp4', + 'md5': '479bb068e5b16462f5176a6828829767', + 'info_dict': { + "title": "tatiana maslany news" } } @@ -28,18 +30,18 @@ def _real_extract(self, url): re_video = r'src=\\x22(?Phttp://%s\.tumblr\.com/video_file/%s/(.*?))\\x22 type=\\x22video/(?P.*?)\\x22' % (blog, video_id) video = re.search(re_video, webpage) if video is None: - raise ExtractorError(u'Unable to extract video') + raise ExtractorError('Unable to extract video') video_url = video.group('video_url') ext = video.group('ext') video_thumbnail = self._search_regex(r'posters(.*?)\[\\x22(?P.*?)\\x22', - webpage, u'thumbnail', fatal=False) # We pick the first poster + webpage, 'thumbnail', fatal=False) # We pick the first poster if video_thumbnail: video_thumbnail = video_thumbnail.replace('\\', '') # The only place where you can get a title, it's not complete, # but searching in other places doesn't work for all videos video_title = self._html_search_regex(r'(?P<title>.*?)(?: \| Tumblr)?', - webpage, u'title', flags=re.DOTALL) + webpage, 'title', flags=re.DOTALL) return [{'id': video_id, 'url': video_url,