Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / extractor / fourtube.py

diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py
index fb6d108c0a62730c7ebc110a0bb599ca1f812c62..fc4a5a0fbf01801d598e20a9addd29ebef4a298e 100644 (file)
--- a/youtube_dl/extractor/fourtube.py
+++ b/youtube_dl/extractor/fourtube.py
@@ -3,12 +3,10 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..compat import (
-    compat_urllib_request,
-)

 from ..utils import (
     parse_duration,
     parse_iso8601,
 from ..utils import (
     parse_duration,
     parse_iso8601,

+    sanitized_Request,

     str_to_int,
 )
 
     str_to_int,
 )
 


@@ -93,7 +91,7 @@ class FourTubeIE(InfoExtractor):
             b'Content-Type': b'application/x-www-form-urlencoded',
             b'Origin': b'http://www.4tube.com',
         }
             b'Content-Type': b'application/x-www-form-urlencoded',
             b'Origin': b'http://www.4tube.com',
         }

-        token_req = compat_urllib_request.Request(token_url, b'{}', headers)
+        token_req = sanitized_Request(token_url, b'{}', headers)

         tokens = self._download_json(token_req, video_id)
         formats = [{
             'url': tokens[format]['token'],
         tokens = self._download_json(token_req, video_id)
         formats = [{
             'url': tokens[format]['token'],