diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 17:25:59 +0100 |
commit | 0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043 (patch) | |
tree | 8f80e441b68bba052f4e91d4ac44e43297a8750f /libmproxy/console/grideditor.py | |
parent | 6c24b1d0d2c3a2860d427e84e30d6022b6500320 (diff) | |
parent | 5acbef236c503bf973a5782dd0139efa977824ea (diff) | |
download | mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.gz mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.tar.bz2 mitmproxy-0b4ad05e02d2d8d4d7329e731ebf52ad5cd20043.zip |
merge master
Diffstat (limited to 'libmproxy/console/grideditor.py')
-rw-r--r-- | libmproxy/console/grideditor.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index fa5142f3..bbdde4e3 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -1,7 +1,7 @@ import copy, re, os import urwid import common -from .. import utils, filt +from .. import utils, filt, script from netlib import http_uastrings @@ -486,8 +486,9 @@ class PathEditor(GridEditor): class ScriptEditor(GridEditor): title = "Editing scripts" columns = 1 - headings = ("Path",) + headings = ("Command",) def is_error(self, col, val): - return False - - + try: + script.Script.parse_command(val) + except script.ScriptError, v: + return str(v) |