Make logging not retarded. Fix tests.

[wizard.git] / wizard / util.py

diff --git a/wizard/util.py b/wizard/util.py
index 61eeed79803591e0e1b954b5e2a2876acd59cded..2d4e4ff4d1993268dbd0822fd326c7e42049c504 100644 (file)
--- a/wizard/util.py
+++ b/wizard/util.py
@@ -92,13 +92,20 @@ def get_exception_name(output):
     fully qualified exception name.
     """
     lines = output.split("\n")
-    for line in lines[1:]: # skip the "traceback" line
+    cue = False
+    for line in lines[1:]:
         line = line.rstrip()
-        if line[0] == ' ': continue
-        if line[-1] == ":":
-            return line[:-1]
-        else:
-            return line
+        if not line: continue
+        if line[0] == ' ':
+            cue = True
+            continue
+        if cue:
+            cue = False
+            if line[-1] == ":":
+                result = line[:-1]
+            else:
+                result = line
+    return result
 
 def get_dir_uid(dir):
     """Finds the uid of the person who owns this directory."""