aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-08-21 17:22:06 +0200
committerMaximilian Hils <git@maximilianhils.com>2017-08-21 17:29:35 +0200
commit7809bd6fe760458a35687a7a2ad451c2c3700e00 (patch)
tree2413f485ab8489ef49c02e15cbe4b39d3ce19da5
parente02138d17782e6383cebc45e0aa438a6f5c5745f (diff)
downloadmitmproxy-7809bd6fe760458a35687a7a2ad451c2c3700e00.tar.gz
mitmproxy-7809bd6fe760458a35687a7a2ad451c2c3700e00.tar.bz2
mitmproxy-7809bd6fe760458a35687a7a2ad451c2c3700e00.zip
move static viewer to fix pyinstaller
-rw-r--r--mitmproxy/tools/web/master.py3
-rw-r--r--mitmproxy/tools/web/static_viewer.py (renamed from mitmproxy/addons/static_viewer.py)0
2 files changed, 1 insertions, 2 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index c391a1cd..3967bafe 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -12,9 +12,8 @@ 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
+from mitmproxy.tools.web import app, webaddons, static_viewer
class WebMaster(master.Master):
diff --git a/mitmproxy/addons/static_viewer.py b/mitmproxy/tools/web/static_viewer.py
index a4629230..a4629230 100644
--- a/mitmproxy/addons/static_viewer.py
+++ b/mitmproxy/tools/web/static_viewer.py