Imported Debian patch 2015.11.27.1-1.1

[youtubedl] / youtube_dl / extractor / mtv.py

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 302c9bf35bc6bb533c10f35ea11cd500012bba0a..d887583e6600806dcb8d21bde241b1169a53e6b0 100644 (file)
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -5,7 +5,6 @@ import re
 from .common import InfoExtractor
 from ..compat import (
     compat_urllib_parse,
 from .common import InfoExtractor
 from ..compat import (
     compat_urllib_parse,

-    compat_urllib_request,

     compat_str,
 )
 from ..utils import (
     compat_str,
 )
 from ..utils import (


@@ -13,6 +12,7 @@ from ..utils import (
     find_xpath_attr,
     fix_xml_ampersands,
     HEADRequest,
     find_xpath_attr,
     fix_xml_ampersands,
     HEADRequest,

+    sanitized_Request,

     unescapeHTML,
     url_basename,
     RegexNotFoundError,
     unescapeHTML,
     url_basename,
     RegexNotFoundError,


@@ -53,7 +53,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
 
     def _extract_mobile_video_formats(self, mtvn_id):
         webpage_url = self._MOBILE_TEMPLATE % mtvn_id
 
     def _extract_mobile_video_formats(self, mtvn_id):
         webpage_url = self._MOBILE_TEMPLATE % mtvn_id

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

         # Otherwise we get a webpage that would execute some javascript
         req.add_header('User-Agent', 'curl/7')
         webpage = self._download_webpage(req, mtvn_id,
         # Otherwise we get a webpage that would execute some javascript
         req.add_header('User-Agent', 'curl/7')
         webpage = self._download_webpage(req, mtvn_id,