Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube_dl / extractor / neteasemusic.py

diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py
index a8e0a64ed4933644965fd07c3eb3216fc532c915..15eca825ad9925ac4ab90902123edebc432c0500 100644 (file)
--- a/youtube_dl/extractor/neteasemusic.py
+++ b/youtube_dl/extractor/neteasemusic.py
@@ -8,11 +8,11 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

-    compat_urllib_request,

     compat_urllib_parse,
     compat_str,
     compat_itertools_count,
 )
     compat_urllib_parse,
     compat_str,
     compat_itertools_count,
 )

+from ..utils import sanitized_Request

 
 
 class NetEaseMusicBaseIE(InfoExtractor):
 
 
 class NetEaseMusicBaseIE(InfoExtractor):


@@ -40,7 +40,7 @@ class NetEaseMusicBaseIE(InfoExtractor):
             if not details:
                 continue
             formats.append({
             if not details:
                 continue
             formats.append({

-                'url': 'http://m1.music.126.net/%s/%s.%s' %
+                'url': 'http://m5.music.126.net/%s/%s.%s' %

                        (cls._encrypt(details['dfsId']), details['dfsId'],
                         details['extension']),
                 'ext': details.get('extension'),
                        (cls._encrypt(details['dfsId']), details['dfsId'],
                         details['extension']),
                 'ext': details.get('extension'),


@@ -56,7 +56,7 @@ class NetEaseMusicBaseIE(InfoExtractor):
         return int(round(ms / 1000.0))
 
     def query_api(self, endpoint, video_id, note):
         return int(round(ms / 1000.0))
 
     def query_api(self, endpoint, video_id, note):

-        req = compat_urllib_request.Request('%s%s' % (self._API_BASE, endpoint))
+        req = sanitized_Request('%s%s' % (self._API_BASE, endpoint))

         req.add_header('Referer', self._API_BASE)
         return self._download_json(req, video_id, note)
 
         req.add_header('Referer', self._API_BASE)
         return self._download_json(req, video_id, note)