Make grid editor file reading more robust.

2012-08-31 13:33:18 +12:00 · 2012-08-31 13:33:18 +12:00 · 26cefc95e8
parent a33e90f081
commit 26cefc95e8
1 changed files with 8 additions and 4 deletions
--- 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: