X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdumpert.py;h=be2e3d37841b48ce7cf187b01ddd5236f85d7683;hb=a61ce71468cb222338ccd8039dc631f3619dc585;hp=f5a31058d5cd8b1f914e9968aeca98751fb90136;hpb=b2f77388305975570d57a4db3ced46aa3856f7a4;p=youtube-dl diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dl/extractor/dumpert.py index f5a31058d..be2e3d378 100644 --- a/youtube_dl/extractor/dumpert.py +++ b/youtube_dl/extractor/dumpert.py @@ -1,12 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -import base64 import re from .common import InfoExtractor -from ..compat import compat_urllib_request -from ..utils import qualities +from ..compat import compat_b64decode +from ..utils import ( + qualities, + sanitized_Request, +) class DumpertIE(InfoExtractor): @@ -19,7 +21,7 @@ class DumpertIE(InfoExtractor): 'ext': 'mp4', 'title': 'Ik heb nieuws voor je', 'description': 'Niet schrikken hoor', - 'thumbnail': 're:^https?://.*\.jpg$', + 'thumbnail': r're:^https?://.*\.jpg$', } }, { 'url': 'http://www.dumpert.nl/embed/6675421/dc440fe7/', @@ -32,7 +34,7 @@ class DumpertIE(InfoExtractor): protocol = mobj.group('protocol') url = '%s://www.dumpert.nl/mediabase/%s' % (protocol, video_id) - req = compat_urllib_request.Request(url) + req = sanitized_Request(url) req.add_header('Cookie', 'nsfw=1; cpc=10') webpage = self._download_webpage(req, video_id) @@ -40,7 +42,7 @@ class DumpertIE(InfoExtractor): r'data-files="([^"]+)"', webpage, 'data files') files = self._parse_json( - base64.b64decode(files_base64.encode('utf-8')).decode('utf-8'), + compat_b64decode(files_base64).decode('utf-8'), video_id) quality = qualities(['flv', 'mobile', 'tablet', '720p'])