From a13581a4c8b65647a584d15c1490b570e387ce4d Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Wed, 30 Dec 2009 01:50:47 +0000 Subject: [PATCH] Handle exceptions in a way that doesn't make python 2.5 really angry --- terminatorlib/plugin.py | 2 +- terminatorlib/terminal.py | 4 ++-- terminatorlib/terminal_popup_menu.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/terminatorlib/plugin.py b/terminatorlib/plugin.py index c2399bec..7c3d1fdf 100755 --- a/terminatorlib/plugin.py +++ b/terminatorlib/plugin.py @@ -85,7 +85,7 @@ class PluginRegistry(borg.Borg): if item not in self.instances: func = getattr(module, item) self.instances[item] = func() - except Exception as e: + except Exception, e: err('PluginRegistry::load_plugins: Importing plugin %s \ failed: %s' % (plugin, e)) diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index 7610c99b..bf13cbfe 100755 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -228,7 +228,7 @@ class Terminal(gtk.VBox): self.matches[name] = self.vte.match_add(match) dbg('Terminal::update_matches: added plugin URL handler \ for %s (%s)' % (name, urlplugin.__class__.__name__)) - except Exception as ex: + except Exception, ex: err('Terminal::update_url_matches: %s' % ex) def connect_signals(self): @@ -895,7 +895,7 @@ for %s (%s)' % (name, urlplugin.__class__.__name__)) %s plugin' % urlplugin.handler_name) url = newurl break; - except Exception as ex: + except Exception, ex: err('Terminal::prepare_url: %s' % ex) return(url) diff --git a/terminatorlib/terminal_popup_menu.py b/terminatorlib/terminal_popup_menu.py index 313f02a3..8800b6ef 100755 --- a/terminatorlib/terminal_popup_menu.py +++ b/terminatorlib/terminal_popup_menu.py @@ -166,7 +166,7 @@ class TerminalPopupMenu(object): menuplugin.callback(menuitems, menu, terminal) for menuitem in menuitems: menu.append(menuitem) - except Exception as ex: + except Exception, ex: err('TerminalPopupMenu::show: %s' % ex) menu.show_all()