aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-01 14:53:34 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-01 14:53:34 +0200
commitff1e7e64094185205a09eda71ef3c83a9fbcc75c (patch)
tree79a6ed20fa026fcec3e65453de9f1387565c5ca6 /libmproxy/console
parentfa568c2d3bce7639d063e5d94de0aa8b2fcadf0e (diff)
downloadmitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.gz
mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.bz2
mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.zip
fix imports for encoding
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/contentview.py4
1 files changed, 2 insertions, 2 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