From 26cefc95e847cf7c2c583a55c727e603baba20e9 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 31 Aug 2012 13:33:18 +1200 Subject: Make grid editor file reading more robust. --- libmproxy/console/grideditor.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libmproxy/console/grideditor.py') diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index 321d0e8b..0c07b60d 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -291,10 +291,14 @@ class GridEditor(common.WWrap): return None def read_file(self, p, unescaped=False): - p = os.path.expanduser(p) - d = file(p, "r").read() - self.walker.set_current_value(d, unescaped) - self.walker._modified() + if p: + try: + p = os.path.expanduser(p) + d = file(p, "r").read() + self.walker.set_current_value(d, unescaped) + self.walker._modified() + except IOError, v: + return str(v) def keypress(self, size, key): if self.walker.editing: -- cgit v1.2.3