From 89a683ae745de77f96ac8e82c8ff16d2675fa398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Fri, 10 Jul 2015 21:15:09 +0600
Subject: [twitch] Fix error message regex

---
 youtube_dl/extractor/twitch.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'youtube_dl/extractor')

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<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:
-- 
cgit v1.2.3