diff options
| author | Matthew Shao <me@matshao.com> | 2017-08-21 09:27:49 +0800 |
|---|---|---|
| committer | Matthew Shao <me@matshao.com> | 2017-08-21 09:41:13 +0800 |
| commit | 2baa2c4049ab6b2801b3836b28b3e9df815a0075 (patch) | |
| tree | 30eb41c7d588825e8739b3b7da8925c47d3ba437 | |
| parent | d008f179c3e6fa620c6babc6cedf8e7df9093827 (diff) | |
| download | mitmproxy-2baa2c4049ab6b2801b3836b28b3e9df815a0075.tar.gz mitmproxy-2baa2c4049ab6b2801b3836b28b3e9df815a0075.tar.bz2 mitmproxy-2baa2c4049ab6b2801b3836b28b3e9df815a0075.zip | |
[web] Move static viewer from default addon to WebMaster.
| -rw-r--r-- | mitmproxy/addons/__init__.py | 2 | ||||
| -rw-r--r-- | mitmproxy/tools/web/master.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/addons/__init__.py b/mitmproxy/addons/__init__.py index e46c215b..62135765 100644 --- a/mitmproxy/addons/__init__.py +++ b/mitmproxy/addons/__init__.py @@ -14,7 +14,6 @@ from mitmproxy.addons import replace from mitmproxy.addons import script from mitmproxy.addons import serverplayback from mitmproxy.addons import setheaders -from mitmproxy.addons import static_viewer from mitmproxy.addons import stickyauth from mitmproxy.addons import stickycookie from mitmproxy.addons import streambodies @@ -40,7 +39,6 @@ def default_addons(): script.ScriptLoader(), serverplayback.ServerPlayback(), setheaders.SetHeaders(), - static_viewer.StaticViewer(), stickyauth.StickyAuth(), stickycookie.StickyCookie(), streambodies.StreamBodies(), diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index b13aeff9..c391a1cd 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -12,6 +12,7 @@ from mitmproxy.addons import readfile from mitmproxy.addons import termlog from mitmproxy.addons import view from mitmproxy.addons import termstatus +from mitmproxy.addons import static_viewer from mitmproxy.options import Options # noqa from mitmproxy.tools.web import app, webaddons @@ -37,6 +38,7 @@ class WebMaster(master.Master): webaddons.WebAddon(), intercept.Intercept(), readfile.ReadFile(), + static_viewer.StaticViewer(), self.view, self.events, ) |