diff options
| -rw-r--r-- | libmproxy/console/contentview.py | 4 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 4 | ||||
| -rw-r--r-- | test/test_console_common.py | 4 | ||||
| -rw-r--r-- | test/test_console_contentview.py | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 8f18ea7a..ce5ac6ea 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -12,10 +12,10 @@ import urwid import html2text import netlib.utils -from netlib import odict +from netlib import odict, encoding from . import common, signals -from .. import utils, encoding +from .. import utils from ..contrib import jsbeautifier from ..contrib.wbxml.ASCommandResponse import ASCommandResponse diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index a85a4f30..1b58f824 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -8,14 +8,14 @@ import urlparse from email.utils import parsedate_tz, formatdate, mktime_tz import netlib -from netlib import http, tcp, odict, utils +from netlib import http, tcp, odict, utils, encoding from netlib.http import cookies, http1, http2 from netlib.http.semantics import CONTENT_MISSING from .tcp import TCPHandler from .primitives import KILL, ProtocolHandler, Flow, Error from ..proxy.connection import ServerConnection -from .. import encoding, utils, controller, stateobject, proxy +from .. import utils, controller, stateobject, proxy from .http_wrappers import decoded, HTTPRequest, HTTPResponse diff --git a/test/test_console_common.py b/test/test_console_common.py index 1949dad5..57cbef98 100644 --- a/test/test_console_common.py +++ b/test/test_console_common.py @@ -3,8 +3,10 @@ from nose.plugins.skip import SkipTest if os.name == "nt": raise SkipTest("Skipped on Windows.") +from netlib import encoding + import libmproxy.console.common as common -from libmproxy import utils, flow, encoding +from libmproxy import utils, flow import tutils diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index b98e1021..d1a6180f 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -5,10 +5,10 @@ if os.name == "nt": import sys import netlib.utils -from netlib import odict +from netlib import odict, encoding import libmproxy.console.contentview as cv -from libmproxy import utils, flow, encoding +from libmproxy import utils, flow import tutils try: |