itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tighten some excepts so we don't silently treat real errors as simple ImportErrors

This commit is contained in:
Thomas Hurst 2008-07-17 18:44:21 +01:00
parent b602ecfe9c
commit e3d3118d67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
terminatorlib/terminatorterm.py
View File

@ -34,7 +34,7 @@ from terminatorlib.encoding import TerminatorEncoding
# import vte-bindings # import vte-bindings
try: try:
import vte import vte
except: except ImportError:
error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
_('You need to install python bindings for libvte ("python-vte" in debian/ubuntu)')) _('You need to install python bindings for libvte ("python-vte" in debian/ubuntu)'))
error.run() error.run()
@ -58,7 +58,7 @@ class TerminatorTerm (gtk.VBox):
from terminatorlib import freebsd from terminatorlib import freebsd
self.pid_get_cwd = lambda pid: freebsd.get_process_cwd(pid) self.pid_get_cwd = lambda pid: freebsd.get_process_cwd(pid)
dbg ('Using FreeBSD self.pid_get_cwd') dbg ('Using FreeBSD self.pid_get_cwd')
except: except (OSError, NotImplementedError, ImportError):
dbg ('FreeBSD version too old for self.pid_get_cwd') dbg ('FreeBSD version too old for self.pid_get_cwd')
pass pass
elif platform.system() == 'Linux': elif platform.system() == 'Linux':
@ -74,7 +74,7 @@ class TerminatorTerm (gtk.VBox):
import gnome import gnome
gnome.init ('terminator', 'terminator') gnome.init ('terminator', 'terminator')
self.url_show = gnome.url_show self.url_show = gnome.url_show
except: except ImportError:
# webbrowser.open() is not really useful, but will do as a fallback # webbrowser.open() is not really useful, but will do as a fallback
dbg ('url_show: gnome module failed, using webbrowser') dbg ('url_show: gnome module failed, using webbrowser')
import webbrowser import webbrowser