[lynda] Simplify login and improve error capturing (#16891)

This commit is contained in:
Sergey M․ 2018-07-03 02:47:09 +07:00
parent db5debf313
commit 5621c3222e
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D

View file

@ -44,21 +44,15 @@ def _login_step(self, form_html, fallback_action_url, extra_form_data, note, ref
form_data = self._hidden_inputs(form_html)
form_data.update(extra_form_data)
try:
response = self._download_json(
action_url, None, note,
data=urlencode_postdata(form_data),
headers={
'Referer': referrer_url,
'X-Requested-With': 'XMLHttpRequest',
})
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 500:
response = self._parse_json(e.cause.read().decode('utf-8'), None)
self._check_error(response, ('email', 'password'))
raise
response = self._download_json(
action_url, None, note,
data=urlencode_postdata(form_data),
headers={
'Referer': referrer_url,
'X-Requested-With': 'XMLHttpRequest',
}, expected_status=(418, 500, ))
self._check_error(response, 'ErrorMessage')
self._check_error(response, ('email', 'password', 'ErrorMessage'))
return response, action_url