diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-15 00:34:23 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-15 00:54:14 +0100 |
| commit | 8a6f8bd461af46d5006a6e3756277af416162262 (patch) | |
| tree | f54400e7bbb01e52f8f85e3f1019690d6a6c6151 /mitmproxy/contentviews | |
| parent | bb2fa6dc7d871d703c6759926521d8c16aae80f1 (diff) | |
| download | mitmproxy-8a6f8bd461af46d5006a6e3756277af416162262.tar.gz mitmproxy-8a6f8bd461af46d5006a6e3756277af416162262.tar.bz2 mitmproxy-8a6f8bd461af46d5006a6e3756277af416162262.zip | |
nuke Pillow
Diffstat (limited to 'mitmproxy/contentviews')
| -rw-r--r-- | mitmproxy/contentviews/image/view.py | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/mitmproxy/contentviews/image/view.py b/mitmproxy/contentviews/image/view.py index 8fdb26e9..d77e1ecb 100644 --- a/mitmproxy/contentviews/image/view.py +++ b/mitmproxy/contentviews/image/view.py @@ -1,13 +1,9 @@ -import io import imghdr -from PIL import Image - +from mitmproxy.contentviews import base from mitmproxy.types import multidict from . import image_parser -from mitmproxy.contentviews import base - class ViewImage(base.View): name = "Image" @@ -16,8 +12,6 @@ class ViewImage(base.View): "image/png", "image/jpeg", "image/gif", - "image/vnd.microsoft.icon", - "image/x-icon", ] def __call__(self, data, **metadata): @@ -37,19 +31,3 @@ class ViewImage(base.View): parts = image_parser.parse_jpeg(data) fmt = base.format_dict(multidict.MultiDict(parts)) return "%s image" % f, fmt - try: - img = Image.open(io.BytesIO(data)) - except IOError: - return None - parts = [ - ("Format", str(img.format_description)), - ("Size", "%s x %s px" % img.size), - ("Mode", str(img.mode)), - ] - for i in sorted(img.info.keys()): - if i != "exif": - parts.append( - (str(i), str(img.info[i])) - ) - fmt = base.format_dict(multidict.MultiDict(parts)) - return "%s image" % img.format, fmt |