projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e2dbcaa
)
[youtube] Relax TFA regexes
author
Sergey M․
<dstftw@gmail.com>
Sun, 10 Jul 2016 20:08:38 +0000
(
03:08
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 10 Jul 2016 20:08:38 +0000
(
03:08
+0700)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index 8aa7dfc413a7141cd56328ec3c0eaa56941b4171..1687d5ef944b76c24ea48c56c341da2817679560 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-137,7
+137,7
@@
class YoutubeBaseInfoExtractor(InfoExtractor):
# Two-Factor
# TODO add SMS and phone call support - these require making a request and then prompting the user
# Two-Factor
# TODO add SMS and phone call support - these require making a request and then prompting the user
- if re.search(r'(?i)<form[^>]
*
id="challenge"', login_results) is not None:
+ if re.search(r'(?i)<form[^>]
+
id="challenge"', login_results) is not None:
tfa_code = self._get_tfa_info('2-step verification code')
if not tfa_code:
tfa_code = self._get_tfa_info('2-step verification code')
if not tfa_code:
@@
-165,17
+165,17
@@
class YoutubeBaseInfoExtractor(InfoExtractor):
if tfa_results is False:
return False
if tfa_results is False:
return False
- if re.search(r'(?i)<form[^>]
*
id="challenge"', tfa_results) is not None:
+ if re.search(r'(?i)<form[^>]
+
id="challenge"', tfa_results) is not None:
self._downloader.report_warning('Two-factor code expired or invalid. Please try again, or use a one-use backup code instead.')
return False
self._downloader.report_warning('Two-factor code expired or invalid. Please try again, or use a one-use backup code instead.')
return False
- if re.search(r'(?i)<form[^>]
*
id="gaia_loginform"', tfa_results) is not None:
+ if re.search(r'(?i)<form[^>]
+
id="gaia_loginform"', tfa_results) is not None:
self._downloader.report_warning('unable to log in - did the page structure change?')
return False
if re.search(r'smsauth-interstitial-reviewsettings', tfa_results) is not None:
self._downloader.report_warning('Your Google account has a security notice. Please log in on your web browser, resolve the notice, and try again.')
return False
self._downloader.report_warning('unable to log in - did the page structure change?')
return False
if re.search(r'smsauth-interstitial-reviewsettings', tfa_results) is not None:
self._downloader.report_warning('Your Google account has a security notice. Please log in on your web browser, resolve the notice, and try again.')
return False
- if re.search(r'(?i)<form[^>]
*
id="gaia_loginform"', login_results) is not None:
+ if re.search(r'(?i)<form[^>]
+
id="gaia_loginform"', login_results) is not None:
self._downloader.report_warning('unable to log in: bad username or password')
return False
return True
self._downloader.report_warning('unable to log in: bad username or password')
return False
return True