Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-02-26 14:37:17 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-02-26 14:37:17 (GMT)
commitf12edf401cd6a272f6dfac6eea20dbb72eb6898f (patch)
tree6a00126e29fa006cd252bb2758d2ce05148924e4 /src
parent1019815885ee5a2e1c638ed544cae5251c6fbaa0 (diff)
parent3073186ae64a768e7cefa5fc4f7226698cf7a075 (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src')
-rw-r--r--src/jarabe/view/keyhandler.py5
1 files changed, 2 insertions, 3 deletions
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())