diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-12-05 15:55:43 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-12-08 10:21:06 +1300 |
| commit | d742d4fb8c8d601c19f7aa5ff746a4167d864f7e (patch) | |
| tree | 7cac08c95870f5ef9f1263d77cc4d80736b1bdaf /test | |
| parent | 6aacd27ab26e6831ad6f9cfe0b1f555617321a25 (diff) | |
| download | mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.gz mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.bz2 mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.zip | |
Replace configargparse with argparse, enable new options loading
This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_proxy.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index 177bac1f..91da47a0 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -5,6 +5,7 @@ import argparse from OpenSSL import SSL from mitmproxy.tools import cmdline +from mitmproxy.tools import main from mitmproxy import options from mitmproxy.proxy import ProxyConfig from mitmproxy import connections @@ -76,7 +77,7 @@ class TestProcessProxyOptions: cmdline.common_options(parser) args = parser.parse_args(args=args) opts = cmdline.get_common_options(args) - pconf = config.ProxyConfig(options.Options(**opts)) + pconf = config.ProxyConfig(options.Options(**main.notnone(opts))) return parser, pconf def assert_err(self, err, *args): |