X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmoevideo.py;h=91ee9c4e95204718cb069fe1dc36908821b7af6d;hb=98763ee354ffc13a57f28dbd006729affacb6d30;hp=7dfa35a3f755424e34e7b5bf65dfca5b8950b4f5;hpb=ff0ba8ce0fbfd099f85aa70480596f3831e02725;p=youtube-dl diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py index 7dfa35a3f..91ee9c4e9 100644 --- a/youtube_dl/extractor/moevideo.py +++ b/youtube_dl/extractor/moevideo.py @@ -7,9 +7,9 @@ import re from .common import InfoExtractor from ..utils import ( ExtractorError, - compat_urllib_parse, - compat_urllib_request, int_or_none, + sanitized_Request, + urlencode_postdata, ) @@ -34,8 +34,9 @@ class MoeVideoIE(InfoExtractor): 'width': 540, 'height': 360, 'duration': 179, - 'filesize_approx': 17822500, - } + 'filesize': 17822500, + }, + 'skip': 'Video has been removed', }, { 'url': 'http://playreplay.net/video/77107.7f325710a627383d40540d8e991a', @@ -49,8 +50,9 @@ class MoeVideoIE(InfoExtractor): 'width': 480, 'height': 296, 'duration': 6027, - 'filesize_approx': 588257923, - } + 'filesize': 588257923, + }, + 'skip': 'Video has been removed', }, ] @@ -76,8 +78,8 @@ class MoeVideoIE(InfoExtractor): ], ] r_json = json.dumps(r) - post = compat_urllib_parse.urlencode({'r': r_json}) - req = compat_urllib_request.Request(self._API_URL, post) + post = urlencode_postdata({'r': r_json}) + req = sanitized_Request(self._API_URL, post) req.add_header('Content-type', 'application/x-www-form-urlencoded') response = self._download_json(req, video_id) @@ -99,7 +101,7 @@ class MoeVideoIE(InfoExtractor): 'url': video_url, 'width': width, 'height': height, - 'filesize_approx': filesize, + 'filesize': filesize, }] return {