diff options
| -rw-r--r-- | mitmproxy/main.py | 2 | ||||
| -rw-r--r-- | mitmproxy/proxy/config.py | 4 | ||||
| -rw-r--r-- | test/mitmproxy/test_proxy.py | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/mitmproxy/main.py b/mitmproxy/main.py index 77cce161..2d7299e4 100644 --- a/mitmproxy/main.py +++ b/mitmproxy/main.py @@ -48,7 +48,7 @@ def process_options(parser, options, args): if args.quiet: args.verbose = 0 debug.register_info_dumpers() - return config.process_proxy_options(parser, options, args) + return config.ProxyConfig(options) def mitmproxy(args=None): # pragma: no cover diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py index bd9f135d..7aa4c736 100644 --- a/mitmproxy/proxy/config.py +++ b/mitmproxy/proxy/config.py @@ -189,7 +189,3 @@ class ProxyConfig: password_manager, "mitmproxy" ) - - -def process_proxy_options(parser, options, args): - return ProxyConfig(options) diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index 4127a889..7095d9d2 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -4,10 +4,10 @@ from OpenSSL import SSL from mitmproxy import cmdline from mitmproxy.proxy import ProxyConfig -from mitmproxy.proxy.config import process_proxy_options from mitmproxy.models.connections import ServerConnection from mitmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler from mitmproxy.flow import options +from mitmproxy.proxy import config from netlib.exceptions import TcpDisconnect from pathod import test from netlib.http import http1 @@ -61,7 +61,7 @@ class TestProcessProxyOptions: cmdline.common_options(parser) args = parser.parse_args(args=args) opts = cmdline.get_common_options(args) - pconf = process_proxy_options(parser, options.Options(**opts), args) + pconf = config.ProxyConfig(options.Options(**opts)) return parser, pconf def assert_err(self, err, *args): |