aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-11 15:31:25 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-11 15:31:25 +0200
commit02d80631dc1efcc1ef7d25b21c40c2327a32f49b (patch)
treefb04081aedb8e1cbd6529b95e46a659222f4f587 /libmproxy/console/__init__.py
parentdd414e485212e3cab612a66d5d858c1a766ace04 (diff)
parent47602dc1a5949a41535bc562adb83279f33f0b73 (diff)
downloadmitmproxy-02d80631dc1efcc1ef7d25b21c40c2327a32f49b.tar.gz
mitmproxy-02d80631dc1efcc1ef7d25b21c40c2327a32f49b.tar.bz2
mitmproxy-02d80631dc1efcc1ef7d25b21c40c2327a32f49b.zip
Merge pull request #764 from mitmproxy/contentviews
Extract Content Views from Console
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r--libmproxy/console/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 2133f97f..b75fa5d8 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -14,9 +14,9 @@ import traceback
import urwid
import weakref
-from .. import controller, flow, script
+from .. import controller, flow, script, contentview
from . import flowlist, flowview, help, window, signals, options
-from . import grideditor, palettes, contentview, statusbar, palettepicker
+from . import grideditor, palettes, statusbar, palettepicker
EVENTLOG_SIZE = 500