commit 89a683ae745de77f96ac8e82c8ff16d2675fa398
parent 008661069b0c33614ebdd7c9bcf838256db1b127
Author: Sergey M․ <dstftw@gmail.com>
Date: Fri, 10 Jul 2015 21:15:09 +0600
[twitch] Fix error message regex
Diffstat:
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py
@@ -74,11 +74,12 @@ class TwitchBaseIE(InfoExtractor):
response = self._download_webpage(
request, None, 'Logging in as %s' % username)
- m = re.search(
- r"id=([\"'])login_error_message\1[^>]*>(?P<msg>[^<]+)", response)
- if m:
+ error_message = self._search_regex(
+ r'<div[^>]+class="subwindow_notice"[^>]*>([^<]+)</div>',
+ response, 'error message', default=None)
+ if error_message:
raise ExtractorError(
- 'Unable to login: %s' % m.group('msg').strip(), expected=True)
+ 'Unable to login. Twitch said: %s' % error_message, expected=True)
def _prefer_source(self, formats):
try: