aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/xtube.py
diff options
context:
space:
mode:
authorArjun Sreedharan <arjun024@gmail.com>2014-02-11 13:27:49 +0530
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-02-11 13:51:37 +0100
commitc5ba203e233a0c345d0fa4b3fb7c6043fd880e6e (patch)
tree261ea6f128c964433660d49ae00a78e413771100 /youtube_dl/extractor/xtube.py
parent2317e6b2b3d909fba23c9ea10203abae15f27106 (diff)
downloadyoutube-dl-c5ba203e233a0c345d0fa4b3fb7c6043fd880e6e.zip
youtube-dl-c5ba203e233a0c345d0fa4b3fb7c6043fd880e6e.tar.gz
youtube-dl-c5ba203e233a0c345d0fa4b3fb7c6043fd880e6e.tar.bz2
[xtube] use unicode_literals
Diffstat (limited to 'youtube_dl/extractor/xtube.py')
-rw-r--r--youtube_dl/extractor/xtube.py26
1 files changed, 14 insertions, 12 deletions
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index 1a6a768..8f8001b 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\.)?(?P<url>xtube\.com/watch\.php\?v=(?P<videoid>[^/?&]+))'
_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'<div class="p_5px[^>]*>([^<]+)', webpage, u'title')
- video_uploader = self._html_search_regex(r'so_s\.addVariable\("owner_u", "([^"]+)', webpage, u'uploader', fatal=False)
- video_description = self._html_search_regex(r'<p class="video_description">([^<]+)', 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'<div class="p_5px[^>]*>([^<]+)', webpage, 'title')
+ video_uploader = self._html_search_regex(r'so_s\.addVariable\("owner_", "([^"]+)', webpage, 'uploader', fatal=False)
+ video_description = self._html_search_regex(r'<p class="video_description">([^<]+)', 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]