Prepare to upload.

[youtubedl] / youtube_dl / extractor / hotnewhiphop.py

diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dl/extractor/hotnewhiphop.py
index 651784b73940032fd65c9675043f045b0bcf4ff2..4703e1894f08f70057ace62fc1411980ea7728b4 100644 (file)
--- a/youtube_dl/extractor/hotnewhiphop.py
+++ b/youtube_dl/extractor/hotnewhiphop.py
@@ -1,20 +1,17 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import base64
-

 from .common import InfoExtractor
 from .common import InfoExtractor

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

 from ..utils import (
     ExtractorError,
     HEADRequest,
 from ..utils import (
     ExtractorError,
     HEADRequest,

+    sanitized_Request,
+    urlencode_postdata,

 )
 
 
 class HotNewHipHopIE(InfoExtractor):
 )
 
 
 class HotNewHipHopIE(InfoExtractor):

-    _VALID_URL = r'http://www\.hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
+    _VALID_URL = r'https?://(?:www\.)?hotnewhiphop\.com/.*\.(?P<id>.*)\.html'

     _TEST = {
         'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
         'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',
     _TEST = {
         'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
         'md5': '2c2cd2f76ef11a9b3b581e8b232f3d96',


@@ -37,11 +34,11 @@ class HotNewHipHopIE(InfoExtractor):
                 r'"contentUrl" content="(.*?)"', webpage, 'content URL')
             return self.url_result(video_url, ie='Youtube')
 
                 r'"contentUrl" content="(.*?)"', webpage, 'content URL')
             return self.url_result(video_url, ie='Youtube')
 

-        reqdata = compat_urllib_parse.urlencode([
+        reqdata = urlencode_postdata([

             ('mediaType', 's'),
             ('mediaId', video_id),
         ])
             ('mediaType', 's'),
             ('mediaId', video_id),
         ])

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

             'http://www.hotnewhiphop.com/ajax/media/getActions/', data=reqdata)
         r.add_header('Content-Type', 'application/x-www-form-urlencoded')
         mkd = self._download_json(
             'http://www.hotnewhiphop.com/ajax/media/getActions/', data=reqdata)
         r.add_header('Content-Type', 'application/x-www-form-urlencoded')
         mkd = self._download_json(


@@ -50,7 +47,7 @@ class HotNewHipHopIE(InfoExtractor):
         if 'mediaKey' not in mkd:
             raise ExtractorError('Did not get a media key')
 
         if 'mediaKey' not in mkd:
             raise ExtractorError('Did not get a media key')
 

-        redirect_url = base64.b64decode(video_url_base64).decode('utf-8')
+        redirect_url = compat_b64decode(video_url_base64).decode('utf-8')

         redirect_req = HEADRequest(redirect_url)
         req = self._request_webpage(
             redirect_req, video_id,
         redirect_req = HEADRequest(redirect_url)
         req = self._request_webpage(
             redirect_req, video_id,