dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sina] use unicode_literals

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-23 14:00:29 +01:00
parent 9dab1b7f28
commit 76f270a46a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/sina.py
View File

@ -1,4 +1,5 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals
import re import re
@ -20,11 +21,11 @@ class SinaIE(InfoExtractor):
''' '''
_TEST = { _TEST = {
u'url': u'http://video.sina.com.cn/news/vlist/zt/chczlj2013/?opsubject_id=top12#110028898', 'url': 'http://video.sina.com.cn/news/vlist/zt/chczlj2013/?opsubject_id=top12#110028898',
u'file': u'110028898.flv', 'file': '110028898.flv',
u'md5': u'd65dd22ddcf44e38ce2bf58a10c3e71f', 'md5': 'd65dd22ddcf44e38ce2bf58a10c3e71f',
u'info_dict': { 'info_dict': {
u'title': u'《中国新闻》 朝鲜要求巴拿马立即释放被扣船员', 'title': '《中国新闻》 朝鲜要求巴拿马立即释放被扣船员',
} }
} }
@ -35,10 +36,10 @@ class SinaIE(InfoExtractor):
def _extract_video(self, video_id): def _extract_video(self, video_id):
data = compat_urllib_parse.urlencode({'vid': video_id}) data = compat_urllib_parse.urlencode({'vid': video_id})
url_doc = self._download_xml('http://v.iask.com/v_play.php?%s' % data, url_doc = self._download_xml('http://v.iask.com/v_play.php?%s' % data,
video_id, u'Downloading video url') video_id, 'Downloading video url')
image_page = self._download_webpage( image_page = self._download_webpage(
'http://interface.video.sina.com.cn/interface/common/getVideoImage.php?%s' % data, 'http://interface.video.sina.com.cn/interface/common/getVideoImage.php?%s' % data,
video_id, u'Downloading thumbnail info') video_id, 'Downloading thumbnail info')
return {'id': video_id, return {'id': video_id,
'url': url_doc.find('./durl/url').text, 'url': url_doc.find('./durl/url').text,
@ -52,7 +53,7 @@ class SinaIE(InfoExtractor):
video_id = mobj.group('id') video_id = mobj.group('id')
if mobj.group('token') is not None: if mobj.group('token') is not None:
# The video id is in the redirected url # The video id is in the redirected url
self.to_screen(u'Getting video id') self.to_screen('Getting video id')
request = compat_urllib_request.Request(url) request = compat_urllib_request.Request(url)
request.get_method = lambda: 'HEAD' request.get_method = lambda: 'HEAD'
(_, urlh) = self._download_webpage_handle(request, 'NA', False) (_, urlh) = self._download_webpage_handle(request, 'NA', False)
@ -60,6 +61,6 @@ class SinaIE(InfoExtractor):
elif video_id is None: elif video_id is None:
pseudo_id = mobj.group('pseudo_id') pseudo_id = mobj.group('pseudo_id')
webpage = self._download_webpage(url, pseudo_id) webpage = self._download_webpage(url, pseudo_id)
video_id = self._search_regex(r'vid:\'(\d+?)\'', webpage, u'video id') video_id = self._search_regex(r'vid:\'(\d+?)\'', webpage, 'video id')
return self._extract_video(video_id) return self._extract_video(video_id)