fix imports for encoding

2 files changed, 4 insertions, 4 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