diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 15:20:07 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 15:20:07 +1300 |
commit | 96e714a74cc861eef2fea3e4a8279793a6f42fe8 (patch) | |
tree | b96f66417a41ac3f0f71b933cf6d6ebeb2cbc307 /libmproxy/console.py | |
parent | edab82f7d8833f1903a4032fab5b530c6096fc07 (diff) | |
download | mitmproxy-96e714a74cc861eef2fea3e4a8279793a6f42fe8.tar.gz mitmproxy-96e714a74cc861eef2fea3e4a8279793a6f42fe8.tar.bz2 mitmproxy-96e714a74cc861eef2fea3e4a8279793a6f42fe8.zip |
Handle nonexistent load files gracefully.
Also improve IOError statusbar messages.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r-- | libmproxy/console.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 6c5a051e..575cc092 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -295,7 +295,7 @@ class ConnectionView(WWrap): f.write(str(c.content)) f.close() except IOError, v: - self.master.statusbar.message(str(v)) + self.master.statusbar.message(v.strerror) def edit(self, part): if self.viewing == self.REQ: @@ -772,7 +772,7 @@ class ConsoleMaster(controller.Master): f.write(data) f.close() except IOError, v: - self.statusbar.message(str(v)) + self.statusbar.message(v.strerror) def save_one_flow(self, path, flow): data = flow.dump() @@ -791,8 +791,7 @@ class ConsoleMaster(controller.Master): data = f.read() f.close() except IOError, v: - self.statusbar.message(str(v)) - return + return v.strerror self.state.load_flows(data, ConsoleFlow) if self.conn_list_view: self.conn_list_view.set_focus(0) |