aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/contentviews.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/contentviews.py')
-rw-r--r--mitmproxy/contentviews.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index 83e6a7ad..03ef8f05 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -16,24 +16,26 @@ from __future__ import absolute_import, print_function, division
import cssutils
import datetime
-import html2text
-import jsbeautifier
import json
import logging
-import lxml.etree
-import lxml.html
import subprocess
import traceback
+import io
+from typing import Mapping # noqa
+
+import lxml.etree
+import lxml.html
from PIL import ExifTags
from PIL import Image
+import html2text
+import jsbeautifier
+
from mitmproxy import exceptions
from mitmproxy.contrib.wbxml import ASCommandResponse
from netlib import http
from netlib import multidict
from netlib import strutils
from netlib.http import url
-from six import BytesIO
-from typing import Mapping # noqa
try:
import pyamf
@@ -422,7 +424,7 @@ class ViewImage(View):
def __call__(self, data, **metadata):
try:
- img = Image.open(BytesIO(data))
+ img = Image.open(io.BytesIO(data))
except IOError:
return None
parts = [