Merge lp:~max-rabkin/ibid/debug-655643 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Improve robustness of debug plugin, esp wrt non-message events.

Untested

[Stefano Rivera (stefanor)]

Should we not be doing something like

def extract_message(msg):
    if isinstance(msg, dict):
        return msg.get('raw', msg)
    return msg

[Stefano Rivera (stefanor)]

LGTM

review: Approve

[Stefano Rivera (stefanor)]

See bug, caught another one...

review: Needs Fixing

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/debug.py'
--- ibid/plugins/debug.py	2010-06-28 20:21:20 +0000
+++ ibid/plugins/debug.py	2010-10-14 11:41:09 +0000
@@ -24,6 +24,19 @@
         if 'exc_info' in event:
             last_exc_event = event
 
+def get_message(event):
+    try:
+        message = event.message
+    except AttributeError:
+        return None
+
+    try:
+        message = message['raw']
+    except (KeyError, TypeError):
+        pass
+
+    return message
+
 class LastException(Processor):
     features = (u'debug',)
     usage = u"""last exception
@@ -41,12 +54,13 @@
                                       u"I'll make an exception for you.")))
         else:
             if kind.lower() == 'exception':
-                try:
-                    lines = [u'%(type)s event "%(message)s" triggered ' %
+                message = get_message(exc_event)
+                if message is None:
+                    lines = [u'%s event triggered' % exc_event.type]
+                else:
+                    lines = [u'%(type)s event %(message)r triggered ' %
                              {'type': exc_event.type,
-                              'message': exc_event.message['raw']}]
-                except KeyError:
-                    lines = [u'%(type)s event triggered' % exc_event.type]
+                              'message': message}]
 
                 lines += format_exception_only(*exc_event['exc_info'][:2])
             elif 'event' in kind.lower():