diff options
Diffstat (limited to 'mitmproxy/tools')
| -rw-r--r-- | mitmproxy/tools/console/master.py | 28 | ||||
| -rw-r--r-- | mitmproxy/tools/main.py | 7 | ||||
| -rw-r--r-- | mitmproxy/tools/web/master.py | 21 |
3 files changed, 4 insertions, 52 deletions
diff --git a/mitmproxy/tools/console/master.py b/mitmproxy/tools/console/master.py index 27f5cb58..9b6cc6ab 100644 --- a/mitmproxy/tools/console/master.py +++ b/mitmproxy/tools/console/master.py @@ -11,7 +11,6 @@ import tempfile import traceback import urwid -from typing import Optional from mitmproxy import addons from mitmproxy import controller @@ -39,33 +38,6 @@ from mitmproxy.net import tcp EVENTLOG_SIZE = 500 -class Options(mitmproxy.options.Options): - def __init__( - self, - *, # all args are keyword-only. - eventlog: bool = False, - focus_follow: bool = False, - intercept: Optional[str] = None, - filter: Optional[str] = None, - palette: Optional[str] = palettes.DEFAULT, - palette_transparent: bool = False, - no_mouse: bool = False, - order: Optional[str] = None, - order_reversed: bool = False, - **kwargs - ): - self.eventlog = eventlog - self.focus_follow = focus_follow - self.intercept = intercept - self.filter = filter - self.palette = palette - self.palette_transparent = palette_transparent - self.no_mouse = no_mouse - self.order = order - self.order_reversed = order_reversed - super().__init__(**kwargs) - - class ConsoleMaster(master.Master): palette = [] diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py index a6b75db1..3c0e44bc 100644 --- a/mitmproxy/tools/main.py +++ b/mitmproxy/tools/main.py @@ -11,6 +11,7 @@ import signal # noqa from mitmproxy.tools import cmdline # noqa from mitmproxy import exceptions # noqa +from mitmproxy import options # noqa from mitmproxy.proxy import config # noqa from mitmproxy.proxy import server # noqa from mitmproxy.utils import version_check # noqa @@ -71,7 +72,7 @@ def mitmproxy(args=None): # pragma: no cover args = parser.parse_args(args) try: - console_options = console.master.Options() + console_options = options.Options() console_options.load_paths(args.conf) console_options.update(**notnone(cmdline.get_common_options(args))) console_options.update( @@ -110,7 +111,7 @@ def mitmdump(args=None): # pragma: no cover master = None try: - dump_options = dump.Options() + dump_options = options.Options() dump_options.load_paths(args.conf) dump_options.update(**notnone(cmdline.get_common_options(args))) dump_options.update( @@ -149,7 +150,7 @@ def mitmweb(args=None): # pragma: no cover args = parser.parse_args(args) try: - web_options = web.master.Options() + web_options = options.Options() web_options.load_paths(args.conf) web_options.update(**notnone(cmdline.get_common_options(args))) web_options.update( diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index 36bdcb07..edb12467 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -1,5 +1,4 @@ import webbrowser -from typing import Optional import tornado.httpserver import tornado.ioloop @@ -7,7 +6,6 @@ from mitmproxy import addons from mitmproxy import exceptions from mitmproxy import log from mitmproxy import master -from mitmproxy import options from mitmproxy.addons import eventstore from mitmproxy.addons import intercept from mitmproxy.addons import termlog @@ -15,25 +13,6 @@ from mitmproxy.addons import view from mitmproxy.tools.web import app -class Options(options.Options): - def __init__( - self, - *, # all args are keyword-only. - intercept: Optional[str] = None, - open_browser: bool = True, - wdebug: bool = False, - wport: int = 8081, - wiface: str = "127.0.0.1", - **kwargs - ) -> None: - self.intercept = intercept - self.open_browser = open_browser - self.wdebug = wdebug - self.wport = wport - self.wiface = wiface - super().__init__(**kwargs) - - class WebMaster(master.Master): def __init__(self, options, server): super().__init__(options, server) |