Merge tag 'upstream/2017.05.18.1'

[youtubedl] / youtube_dl / extractor / minhateca.py

diff --git a/youtube_dl/extractor/minhateca.py b/youtube_dl/extractor/minhateca.py
index 14934b7ec5579d3b7cfb4b16e5308e81301ace63..dccc542497692ac6aa14a6e36f6b96b0aad7741d 100644 (file)
--- a/youtube_dl/extractor/minhateca.py
+++ b/youtube_dl/extractor/minhateca.py
@@ -2,14 +2,12 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

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

 from ..utils import (
     int_or_none,
     parse_duration,
     parse_filesize,
 from ..utils import (
     int_or_none,
     parse_duration,
     parse_filesize,

+    sanitized_Request,
+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -21,7 +19,7 @@ class MinhatecaIE(InfoExtractor):
             'id': '125848331',
             'ext': 'mp4',
             'title': 'youtube-dl test video',
             'id': '125848331',
             'ext': 'mp4',
             'title': 'youtube-dl test video',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'filesize_approx': 1530000,
             'duration': 9,
             'view_count': int,
             'filesize_approx': 1530000,
             'duration': 9,
             'view_count': int,


@@ -39,9 +37,9 @@ class MinhatecaIE(InfoExtractor):
             ('fileId', video_id),
             ('__RequestVerificationToken', token),
         ]
             ('fileId', video_id),
             ('__RequestVerificationToken', token),
         ]

-        req = compat_urllib_request.Request(
+        req = sanitized_Request(

             'http://minhateca.com.br/action/License/Download',
             'http://minhateca.com.br/action/License/Download',

-            data=compat_urllib_parse.urlencode(token_data))
+            data=urlencode_postdata(token_data))

         req.add_header('Content-Type', 'application/x-www-form-urlencoded')
         data = self._download_json(
             req, video_id, note='Downloading metadata')
         req.add_header('Content-Type', 'application/x-www-form-urlencoded')
         data = self._download_json(
             req, video_id, note='Downloading metadata')