diff options
| author | Sachin Kelkar <sachinkel19@gmail.com> | 2017-02-03 17:32:55 +0530 |
|---|---|---|
| committer | Sachin Kelkar <sachinkel19@gmail.com> | 2017-02-03 18:40:50 +0530 |
| commit | 15548ff433d4283d4e46906decde5baa406b6584 (patch) | |
| tree | 5dad4e25926481ea5460c3ac223649e006852adb /mitmproxy/contentviews | |
| parent | 0674485e76b14377922d6763e546fa1466d0452f (diff) | |
| download | mitmproxy-15548ff433d4283d4e46906decde5baa406b6584.tar.gz mitmproxy-15548ff433d4283d4e46906decde5baa406b6584.tar.bz2 mitmproxy-15548ff433d4283d4e46906decde5baa406b6584.zip | |
Feedback
Diffstat (limited to 'mitmproxy/contentviews')
| -rw-r--r-- | mitmproxy/contentviews/image/__init__.py | 2 | ||||
| -rw-r--r-- | mitmproxy/contentviews/image/image_parser.py | 4 | ||||
| -rw-r--r-- | mitmproxy/contentviews/image/view.py | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mitmproxy/contentviews/image/__init__.py b/mitmproxy/contentviews/image/__init__.py index d2de66d0..0d0f06e0 100644 --- a/mitmproxy/contentviews/image/__init__.py +++ b/mitmproxy/contentviews/image/__init__.py @@ -1 +1 @@ -from .view import ViewImage +from .view import ViewImage # noqa diff --git a/mitmproxy/contentviews/image/image_parser.py b/mitmproxy/contentviews/image/image_parser.py index 11d66c61..0af58a88 100644 --- a/mitmproxy/contentviews/image/image_parser.py +++ b/mitmproxy/contentviews/image/image_parser.py @@ -1,3 +1,4 @@ +import io import typing from kaitaistruct import KaitaiStream @@ -6,8 +7,9 @@ from mitmproxy.contrib.kaitaistruct import png Metadata = typing.List[typing.Tuple[str, str]] + def parse_png(data: bytes) -> Metadata: - img = png.Png(KaitaiStream(data)) + img = png.Png(KaitaiStream(io.BytesIO(data))) parts = [ ('Format', 'Portable network graphics') ] diff --git a/mitmproxy/contentviews/image/view.py b/mitmproxy/contentviews/image/view.py index 4d13c917..08a70795 100644 --- a/mitmproxy/contentviews/image/view.py +++ b/mitmproxy/contentviews/image/view.py @@ -1,4 +1,5 @@ -import io, imghdr +import io +import imghdr from PIL import ExifTags from PIL import Image @@ -7,7 +8,6 @@ from mitmproxy.types import multidict from . import image_parser from mitmproxy.contentviews import base -from kaitaistruct import KaitaiStream class ViewImage(base.View): @@ -24,7 +24,7 @@ class ViewImage(base.View): def __call__(self, data, **metadata): if imghdr.what('', h=data) == 'png': f = "PNG" - parts = image_parser.parse_png(io.BytesIO(data)) + parts = image_parser.parse_png(data) fmt = base.format_dict(multidict.MultiDict(parts)) return "%s image" % f, fmt try: |