X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fporn91.py;h=24c3600fe3224347a415226f0cfa73f38eaeca51;hb=a61ce71468cb222338ccd8039dc631f3619dc585;hp=a6dd2694cefac83d9e21392d0d0ccc211207a6f1;hpb=d95114dd8359d10c6a0ca5eaddbbd94806173957;p=youtube-dl diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index a6dd2694c..24c3600fe 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -1,10 +1,6 @@ -# encoding: utf-8 +# coding: utf-8 from __future__ import unicode_literals -from ..compat import ( - compat_urllib_parse, - compat_urllib_parse_unquote, -) from .common import InfoExtractor from ..utils import ( parse_duration, @@ -19,7 +15,7 @@ class Porn91IE(InfoExtractor): _TEST = { 'url': 'http://91porn.com/view_video.php?viewkey=7e42283b4f5ab36da134', - 'md5': '6df8f6d028bc8b14f5dbd73af742fb20', + 'md5': '7fcdb5349354f40d41689bd0fa8db05a', 'info_dict': { 'id': '7e42283b4f5ab36da134', 'title': '18å²å¤§ä¸æ¼äº®å¦å¦¹ï¼æ°´å«©æ§æï¼åç½ä¸æ¬¡ï¼', @@ -31,9 +27,10 @@ class Porn91IE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - url = 'http://91porn.com/view_video.php?viewkey=%s' % video_id self._set_cookie('91porn.com', 'language', 'cn_CN') - webpage = self._download_webpage(url, video_id, 'get HTML content') + + webpage = self._download_webpage( + 'http://91porn.com/view_video.php?viewkey=%s' % video_id, video_id) if 'ä½ä¸ºæ¸¸å®¢ï¼ä½ æ¯å¤©åªå¯è§ç10个è§é¢' in webpage: raise ExtractorError('91 Porn says: Daily limit 10 videos exceeded', expected=True) @@ -42,24 +39,7 @@ class Porn91IE(InfoExtractor): r'