aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/web/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-12-05 17:49:16 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-12-08 10:21:06 +1300
commita617e3b5f717b95d1ffc8c87dd70712e36445be9 (patch)
tree0970185c4c7530856c5f19c8446b4150bbf5eb07 /mitmproxy/tools/web/master.py
parentd742d4fb8c8d601c19f7aa5ff746a4167d864f7e (diff)
downloadmitmproxy-a617e3b5f717b95d1ffc8c87dd70712e36445be9.tar.gz
mitmproxy-a617e3b5f717b95d1ffc8c87dd70712e36445be9.tar.bz2
mitmproxy-a617e3b5f717b95d1ffc8c87dd70712e36445be9.zip
Amalgamate all the Options objects
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r--mitmproxy/tools/web/master.py21
1 files changed, 0 insertions, 21 deletions
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)