X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fporn91.py;h=20eac647a87c10ad405c5dd9394bd6b04d66e7f9;hb=43ebf77df3bbd93dbbd0336b0243d8d50895ab72;hp=3e15533e9d445e96884974af398e0461438bcc8b;hpb=55801fc76e2813de9a84eaa830d70ed73cb44463;p=youtube-dl diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index 3e15533e9..20eac647a 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -1,7 +1,6 @@ -# encoding: utf-8 +# coding: utf-8 from __future__ import unicode_literals -from ..compat import compat_urllib_parse from .common import InfoExtractor from ..utils import ( parse_duration, @@ -16,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å²å¤§ä¸æ¼äº®å¦å¦¹ï¼æ°´å«©æ§æï¼åç½ä¸æ¬¡ï¼', @@ -28,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) @@ -39,23 +39,12 @@ class Porn91IE(InfoExtractor): r'