PR #700

Start moving the contentview up a level
Started shifting the contentview class up to libmproxy

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
 
 

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 = [

libmproxy/contentview.py

@@ -14,10 +14,10 @@ import html2text
 import netlib.utils
 from netlib import odict, encoding
 
-from . import common, signals
+from .console import common, signals
-from .. import utils
+from . import utils
-from ..contrib import jsbeautifier
+from .contrib import jsbeautifier
-from ..contrib.wbxml.ASCommandResponse import ASCommandResponse
+from .contrib.wbxml.ASCommandResponse import ASCommandResponse
 
 try:
     import pyamf

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
 

test/test_console_import.py

@@ -0,0 +1,5 @@
+import libmproxy.contentview as cv
+
+
+def test_pass():
+    assert True