X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmoevideo.py;h=978d5d5bfeaf5ff64b7279343876a3177c43339a;hb=95843da5297965bb535262002c92a4d0afcb7e12;hp=184f9c2c9e216a47b635680ba928f1c3c403619d;hpb=1cc79574fc5df21bf35dccf61eac0e9e75ed8d20;p=youtube-dl diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py index 184f9c2c9..978d5d5bf 100644 --- a/youtube_dl/extractor/moevideo.py +++ b/youtube_dl/extractor/moevideo.py @@ -5,13 +5,11 @@ import json import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse, - compat_urllib_request, -) from ..utils import ( ExtractorError, int_or_none, + sanitized_Request, + urlencode_postdata, ) @@ -52,7 +50,8 @@ class MoeVideoIE(InfoExtractor): 'height': 296, 'duration': 6027, 'filesize': 588257923, - } + }, + 'skip': 'Video has been removed', }, ] @@ -78,8 +77,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)