diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-07-30 01:14:59 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2017-07-30 01:25:36 +0200 |
| commit | ed1ab3f0b10aea3ea964ef61af2605685909eac9 (patch) | |
| tree | 57ed9b4b1fa83995605c5a32a0c97119cfe714d9 /mitmproxy/tools/web/master.py | |
| parent | b2f7995a038a5eff2e74f8326c0e8fe45155a049 (diff) | |
| download | mitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.tar.gz mitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.tar.bz2 mitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.zip | |
disentangle ProxyServer and Master classes.
The proxy server should ultimately be an addon itself and not be passed
to the Master constructor. This commit already removes the server in the majority
of instances, and also replaces a large number of ProxyConfig usages with the Options class..
Diffstat (limited to 'mitmproxy/tools/web/master.py')
| -rw-r--r-- | mitmproxy/tools/web/master.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index a36d3a87..6453dc4e 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -17,8 +17,8 @@ from mitmproxy.tools.web import app, webaddons class WebMaster(master.Master): - def __init__(self, options, server, with_termlog=True): - super().__init__(options, server) + def __init__(self, options, with_termlog=True): + super().__init__(options) self.view = view.View() self.view.sig_view_add.connect(self._sig_view_add) self.view.sig_view_remove.connect(self._sig_view_remove) @@ -45,8 +45,6 @@ class WebMaster(master.Master): self.app = app.Application( self, self.options.web_debug ) - # This line is just for type hinting - self.options = self.options # type: Options def _sig_view_add(self, view, flow): app.ClientConnection.broadcast( |