diff options
| author | Chris Czub <chris.czub@gmail.com> | 2015-09-02 14:28:25 -0400 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-02 20:30:58 +0200 |
| commit | b4e0be905213cdcd8c764fbbe87b63f411e765b4 (patch) | |
| tree | bf65d1953995c9bef517397f690afe35850483fe /libmproxy | |
| parent | c14fbc7794eee2a60d3c90f818ec481cf9db544b (diff) | |
| download | mitmproxy-b4e0be905213cdcd8c764fbbe87b63f411e765b4.tar.gz mitmproxy-b4e0be905213cdcd8c764fbbe87b63f411e765b4.tar.bz2 mitmproxy-b4e0be905213cdcd8c764fbbe87b63f411e765b4.zip | |
PR #700
Start moving the contentview up a level
Started shifting the contentview class up to libmproxy
Diffstat (limited to 'libmproxy')
| -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 |
3 files changed, 8 insertions, 7 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 |