gready regex bastard :)

stamparm · stamparm · commit b2b521fc8a1d · 2010-11-24T12:01:36.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1539,7 +1539,7 @@ def extractErrorMessage(page):
     retVal = None
 
     if isinstance(page, basestring):
-        for regex in (r"<b>[^<]*(fatal|error|warning|exception)[^<]*</b>:?\s+(?P<result>.+)<br\s*/?\s*>", r"<li>Error Type:<br>(?P<result>.+?)</li>"):
+        for regex in (r"<b>[^<]*(fatal|error|warning|exception)[^<]*</b>:?\s+(?P<result>.+?)<br\s*/?\s*>", r"<li>Error Type:<br>(?P<result>.+?)</li>"):
             match = re.search(regex, page, re.DOTALL | re.IGNORECASE)
             if match:
                 retVal = htmlunescape(match.group("result")).replace("<br>", "\n").strip()
