diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-08-31 13:33:18 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-08-31 13:33:18 +1200 |
| commit | 26cefc95e847cf7c2c583a55c727e603baba20e9 (patch) | |
| tree | 1fdd69ecc20b70c1cdaacc8533e17015aac826ce /libmproxy/console/grideditor.py | |
| parent | a33e90f0818b784b667b92a3f99a1bca6a84a298 (diff) | |
| download | mitmproxy-26cefc95e847cf7c2c583a55c727e603baba20e9.tar.gz mitmproxy-26cefc95e847cf7c2c583a55c727e603baba20e9.tar.bz2 mitmproxy-26cefc95e847cf7c2c583a55c727e603baba20e9.zip | |
Make grid editor file reading more robust.
Diffstat (limited to 'libmproxy/console/grideditor.py')
| -rw-r--r-- | libmproxy/console/grideditor.py | 12 |
1 files changed, 8 insertions, 4 deletions
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: |