From 000196fe21bfc3980e90e20ff013c4b393eb5190 Mon Sep 17 00:00:00 2001 From: Thomas Roth Date: Thu, 25 Feb 2010 12:14:47 +0100 Subject: [PATCH] Added exception if starting editor fails and added vi as default editor. --- libmproxy/console.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libmproxy/console.py b/libmproxy/console.py index fe2fa4b25..f666f71ac 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -244,8 +244,18 @@ class ConnectionView(urwid.WidgetWrap): os.write(fd, data) os.close(fd) c = os.environ.get("EDITOR") + #If no EDITOR is set, assume 'vi' + if not c: + c = "vi" cmd = [c, name] - ret = subprocess.call(cmd) + try: + ret = subprocess.call(cmd) + except: + self.master.statusbar.message("Can't start editor: %s" % c) + self.master.ui._curs_set(1) + self.master.ui.clear() + os.unlink(name) + return data # Not sure why, unless we do this we get a visible cursor after # spawning 'less'. self.master.ui._curs_set(1)