From f12edf401cd6a272f6dfac6eea20dbb72eb6898f Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Thu, 26 Feb 2009 14:37:17 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index da000b3..3039516 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-import signal
 import logging
 import subprocess
 import errno
@@ -106,9 +105,9 @@ class KeyHandler(object):
                         if key in _actions_table:
                             raise ValueError('Key %r is already bound' % key)
                         _actions_table[key] = module
-                except Exception:
+                except:
                     logging.error('Exception while loading extension:\n' + \
-                        ''.join(traceback.format_exception(*sys.exc_info())))
+                                  traceback.format_exc())
 
         self._key_grabber.grab_keys(_actions_table.keys())
 
--
cgit v0.9.1