debian/watch: Skip pgpsigurlmangle for the moment.

[youtubedl] / youtube_dl / extractor / safari.py

diff --git a/youtube_dl/extractor/safari.py b/youtube_dl/extractor/safari.py
index a602af6928d2a9d054fc8670342a6ddf7d9ef4da..7de7b7273523ea8a43a6d22e8ab684afb4fc5875 100644 (file)
--- a/youtube_dl/extractor/safari.py
+++ b/youtube_dl/extractor/safari.py
@@ -4,16 +4,14 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from .brightcove import BrightcoveIE
+from .brightcove import BrightcoveLegacyIE

 
 

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

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

+    sanitized_Request,

     smuggle_url,
     std_headers,
     smuggle_url,
     std_headers,

+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -58,8 +56,8 @@ class SafariBaseIE(InfoExtractor):
             'next': '',
         }
 
             'next': '',
         }
 

-        request = compat_urllib_request.Request(
-            self._LOGIN_URL, compat_urllib_parse.urlencode(login_form), headers=headers)
+        request = sanitized_Request(
+            self._LOGIN_URL, urlencode_postdata(login_form), headers=headers)

         login_page = self._download_webpage(
             request, None, 'Logging in as %s' % username)
 
         login_page = self._download_webpage(
             request, None, 'Logging in as %s' % username)
 


@@ -112,11 +110,11 @@ class SafariIE(SafariBaseIE):
             '%s/%s/chapter-content/%s.html' % (self._API_BASE, course_id, part),
             part)
 
             '%s/%s/chapter-content/%s.html' % (self._API_BASE, course_id, part),
             part)
 

-        bc_url = BrightcoveIE._extract_brightcove_url(webpage)
+        bc_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)

         if not bc_url:
             raise ExtractorError('Could not extract Brightcove URL from %s' % url, expected=True)
 
         if not bc_url:
             raise ExtractorError('Could not extract Brightcove URL from %s' % url, expected=True)
 

-        return self.url_result(smuggle_url(bc_url, {'Referer': url}), 'Brightcove')
+        return self.url_result(smuggle_url(bc_url, {'Referer': url}), 'BrightcoveLegacy')

 
 
 class SafariCourseIE(SafariBaseIE):
 
 
 class SafariCourseIE(SafariBaseIE):