X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftube8.py;h=46ef61ff5cafbac172b975e64be9e86ae5e3de91;hb=5c2266df4b9aeb7881ed8c026a038e2a25e43734;hp=6ca8840b0869f1490c06c7df0905c28e38ba1fee;hpb=bba5bfc89056f0e3e677046484d30bf29c877ab4;p=youtube-dl diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py index 6ca8840b0..46ef61ff5 100644 --- a/youtube_dl/extractor/tube8.py +++ b/youtube_dl/extractor/tube8.py @@ -4,12 +4,10 @@ import json import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_urlparse, - compat_urllib_request, -) +from ..compat import compat_urllib_parse_urlparse from ..utils import ( int_or_none, + sanitized_Request, str_to_int, ) from ..aes import aes_decrypt_text @@ -42,12 +40,12 @@ class Tube8IE(InfoExtractor): video_id = mobj.group('id') display_id = mobj.group('display_id') - req = compat_urllib_request.Request(url) + req = sanitized_Request(url) req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, display_id) flashvars = json.loads(self._html_search_regex( - r'flashvars\s*=\s*({.+?})', webpage, 'flashvars')) + r'flashvars\s*=\s*({.+?});\r?\n', webpage, 'flashvars')) video_url = flashvars['video_url'] if flashvars.get('encrypted') is True: