projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit @mutantmonkey for ustudio (#8574) and kusi (#8575)
[youtube-dl]
/
youtube_dl
/
extractor
/
safari.py
diff --git
a/youtube_dl/extractor/safari.py
b/youtube_dl/extractor/safari.py
index e9e33d0a3979a33c3a913d38a564c2d5f754cef5..a65fc8ed706efa02e4d008494ea8269c10ad8b3a 100644
(file)
--- a/
youtube_dl/extractor/safari.py
+++ b/
youtube_dl/extractor/safari.py
@@
-6,14
+6,12
@@
import re
from .common import InfoExtractor
from .brightcove import BrightcoveLegacyIE
from .common import InfoExtractor
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,
)
)
@@
-38,12
+36,13
@@
class SafariBaseIE(InfoExtractor):
if username is None:
self.raise_login_required('safaribooksonline.com account is required')
if username is None:
self.raise_login_required('safaribooksonline.com account is required')
- headers = std_headers
+ headers = std_headers
.copy()
if 'Referer' not in headers:
headers['Referer'] = self._LOGIN_URL
if 'Referer' not in headers:
headers['Referer'] = self._LOGIN_URL
+ login_page_request = sanitized_Request(self._LOGIN_URL, headers=headers)
login_page = self._download_webpage(
login_page = self._download_webpage(
-
self._LOGIN_URL
, None,
+
login_page_request
, None,
'Downloading login form')
csrf = self._html_search_regex(
'Downloading login form')
csrf = self._html_search_regex(
@@
-58,8
+57,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)