From: Sergey M․ Date: Fri, 10 Jul 2015 15:15:09 +0000 (+0600) Subject: [twitch] Fix error message regex X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=89a683ae745de77f96ac8e82c8ff16d2675fa398;p=youtube-dl [twitch] Fix error message regex --- diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py index b7a72a7bd..f912d3825 100644 --- 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[^<]+)", response) - if m: + error_message = self._search_regex( + r']+class="subwindow_notice"[^>]*>([^<]+)', + 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: