From: Arjun Sreedharan Date: Tue, 11 Feb 2014 07:57:49 +0000 (+0530) Subject: [xtube] use unicode_literals X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c5ba203e233a0c345d0fa4b3fb7c6043fd880e6e;p=youtube-dl [xtube] use unicode_literals --- diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py index 1a6a7688d..8f8001b4c 100644 --- a/youtube_dl/extractor/xtube.py +++ b/youtube_dl/extractor/xtube.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import os import re @@ -10,14 +12,14 @@ from ..utils import ( class XTubeIE(InfoExtractor): _VALID_URL = r'^(?:https?://)?(?:www\.)?(?Pxtube\.com/watch\.php\?v=(?P[^/?&]+))' _TEST = { - u'url': u'http://www.xtube.com/watch.php?v=kVTUy_G222_', - u'file': u'kVTUy_G222_.mp4', - u'md5': u'092fbdd3cbe292c920ef6fc6a8a9cdab', - u'info_dict': { - u"title": u"strange erotica", - u"description": u"surreal gay themed erotica...almost an ET kind of thing", - u"uploader": u"greenshowers", - u"age_limit": 18, + 'url': 'http://www.xtube.com/watch.php?v=kVTUy_G222_', + 'file': 'kVTUy_G222_.mp4', + 'md5': '092fbdd3cbe292c920ef6fc6a8a9cdab', + 'info_dict': { + "title": "strange erotica", + "description": "surreal gay themed erotica...almost an ET kind of thing", + "uploader": "greenshowers", + "age_limit": 18, } } @@ -30,10 +32,10 @@ class XTubeIE(InfoExtractor): req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) - video_title = self._html_search_regex(r'
([^<]+)', webpage, u'description', fatal=False) - video_url= self._html_search_regex(r'var videoMp4 = "([^"]+)', webpage, u'video_url').replace('\\/', '/') + video_title = self._html_search_regex(r'
([^<]+)', webpage, 'description', fatal=False) + video_url= self._html_search_regex(r'var videoMp4 = "([^"]+)', webpage, 'video_url').replace('\\/', '/') path = compat_urllib_parse_urlparse(video_url).path extension = os.path.splitext(path)[1][1:] format = path.split('/')[5].split('_')[:2]