diff options
| -rw-r--r-- | libmproxy/console/flowview.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/options.py | 3 | ||||
| -rw-r--r-- | libmproxy/contentview.py (renamed from libmproxy/console/contentview.py) | 8 | ||||
| -rw-r--r-- | test/test_console_contentview.py | 2 | ||||
| -rw-r--r-- | test/test_console_import.py | 5 |
5 files changed, 14 insertions, 8 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 8b828653..8cec3c36 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -6,9 +6,9 @@ import urwid from netlib import odict from netlib.http.semantics import CONTENT_MISSING -from . import common, grideditor, contentview, signals, searchable, tabs +from . import common, grideditor, signals, searchable, tabs from . import flowdetailview -from .. import utils, controller +from .. import utils, controller, contentview from ..models import HTTPRequest, HTTPResponse, decoded diff --git a/libmproxy/console/options.py b/libmproxy/console/options.py index 58a4d469..0948e96d 100644 --- a/libmproxy/console/options.py +++ b/libmproxy/console/options.py @@ -1,6 +1,7 @@ import urwid -from . import common, signals, grideditor, contentview +from .. import contentview +from . import common, signals, grideditor from . import select, palettes footer = [ diff --git a/libmproxy/console/contentview.py b/libmproxy/contentview.py index 95ea7b17..3345f5b3 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/contentview.py @@ -14,10 +14,10 @@ import html2text import netlib.utils from netlib import odict, encoding -from . import common, signals -from .. import utils -from ..contrib import jsbeautifier -from ..contrib.wbxml.ASCommandResponse import ASCommandResponse +from .console import common, signals +from . import utils +from .contrib import jsbeautifier +from .contrib.wbxml.ASCommandResponse import ASCommandResponse try: import pyamf diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index d1a6180f..50c3f766 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -7,7 +7,7 @@ import sys import netlib.utils from netlib import odict, encoding -import libmproxy.console.contentview as cv +import libmproxy.contentview as cv from libmproxy import utils, flow import tutils diff --git a/test/test_console_import.py b/test/test_console_import.py new file mode 100644 index 00000000..c99faae8 --- /dev/null +++ b/test/test_console_import.py @@ -0,0 +1,5 @@ +import libmproxy.contentview as cv + + +def test_pass(): + assert True |