X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmooshare.py;h=a85109a89fea66ab16722c09bf8a5b9b06ad7998;hb=40a056d85d7711e2f93bd5f7cc057672650386b8;hp=4c5a4e673f08dbae7075f9db567a1f238e18e1a1;hpb=1bbe317508fa151336034eda4809d0fea1684667;p=youtube-dl diff --git a/youtube_dl/extractor/mooshare.py b/youtube_dl/extractor/mooshare.py index 4c5a4e673..a85109a89 100644 --- a/youtube_dl/extractor/mooshare.py +++ b/youtube_dl/extractor/mooshare.py @@ -1,22 +1,19 @@ from __future__ import unicode_literals import re -import time from .common import InfoExtractor -from ..compat import ( - compat_urllib_request, - compat_urllib_parse, -) from ..utils import ( ExtractorError, + sanitized_Request, + urlencode_postdata, ) class MooshareIE(InfoExtractor): IE_NAME = 'mooshare' IE_DESC = 'Mooshare.biz' - _VALID_URL = r'http://(?:www\.)?mooshare\.biz/(?P[\da-z]{12})' + _VALID_URL = r'https?://(?:www\.)?mooshare\.biz/(?P[\da-z]{12})' _TESTS = [ { @@ -60,8 +57,8 @@ class MooshareIE(InfoExtractor): 'hash': hash_key, } - request = compat_urllib_request.Request( - 'http://mooshare.biz/%s' % video_id, compat_urllib_parse.urlencode(download_form)) + request = sanitized_Request( + 'http://mooshare.biz/%s' % video_id, urlencode_postdata(download_form)) request.add_header('Content-Type', 'application/x-www-form-urlencoded') self._sleep(5, video_id)