aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mitmproxy/contentviews.py1
-rw-r--r--netlib/http/message.py2
-rw-r--r--test/mitmproxy/test_contentview.py1
3 files changed, 1 insertions, 3 deletions
diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index c9ea14ba..6072f959 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -31,7 +31,6 @@ from six import BytesIO
from mitmproxy import exceptions
from mitmproxy.contrib import jsbeautifier
from mitmproxy.contrib.wbxml import ASCommandResponse
-from netlib import encoding
from netlib import http
from netlib import multidict
from netlib.http import url
diff --git a/netlib/http/message.py b/netlib/http/message.py
index 668198f8..28278bd2 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -322,4 +322,4 @@ class decoded(object):
pass
def __exit__(self, type, value, tb):
- pass \ No newline at end of file
+ pass
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index 4b099d8d..7037745d 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -1,6 +1,5 @@
from mitmproxy.exceptions import ContentViewException
from netlib.http import Headers
-from netlib import encoding
from netlib.http import url
from netlib import multidict