diff options
| author | Miroslav <ttahabatt@gmail.com> | 2018-09-29 15:54:17 +0300 |
|---|---|---|
| committer | Miroslav <ttahabatt@gmail.com> | 2018-09-29 15:54:17 +0300 |
| commit | ed9e3d5137974dc824c8350d89439c46f711ef46 (patch) | |
| tree | 705587dd8e41e32d20dbd9f82b05fb2bfefabd2e /mitmproxy | |
| parent | 7f5d8d0997dde853c90831eef4678b06104f7e76 (diff) | |
| download | mitmproxy-ed9e3d5137974dc824c8350d89439c46f711ef46.tar.gz mitmproxy-ed9e3d5137974dc824c8350d89439c46f711ef46.tar.bz2 mitmproxy-ed9e3d5137974dc824c8350d89439c46f711ef46.zip | |
keys.yaml priority over defaultkeys.py. Test for this.
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/tools/console/keymap.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mitmproxy/tools/console/keymap.py b/mitmproxy/tools/console/keymap.py index d22420bf..01ec9a0a 100644 --- a/mitmproxy/tools/console/keymap.py +++ b/mitmproxy/tools/console/keymap.py @@ -199,11 +199,14 @@ class KeymapConfig: "Error reading %s: %s" % (p, e) ) from e for v in vals: + user_ctxs = v.get("ctx", ["global"]) try: + km._check_contexts(user_ctxs) + km.remove(v["key"], Contexts) km.add( key = v["key"], command = v["cmd"], - contexts = v.get("ctx", ["global"]), + contexts = user_ctxs, help = v.get("help", None), ) except ValueError as e: |