diff options
Diffstat (limited to 'mitmproxy/contentviews/image/image_parser.py')
| -rw-r--r-- | mitmproxy/contentviews/image/image_parser.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mitmproxy/contentviews/image/image_parser.py b/mitmproxy/contentviews/image/image_parser.py index 3a375006..11d66c61 100644 --- a/mitmproxy/contentviews/image/image_parser.py +++ b/mitmproxy/contentviews/image/image_parser.py @@ -2,25 +2,27 @@ import typing from kaitaistruct import KaitaiStream -from . import png +from mitmproxy.contrib.kaitaistruct import png Metadata = typing.List[typing.Tuple[str, str]] def parse_png(data: bytes) -> Metadata: img = png.Png(KaitaiStream(data)) - parts = [tuple(['Format', 'Portable network graphics'])] - parts.append(tuple(['Size', str(img.ihdr.width) + " x " + str(img.ihdr.height) + " px"])) + parts = [ + ('Format', 'Portable network graphics') + ] + parts.append(('Size', "{0} x {1} px".format(img.ihdr.width, img.ihdr.height))) for chunk in img.chunks: if chunk.type == 'gAMA': - parts.append(tuple(['gamma', str(chunk.body.gamma_int / 100000)])) + parts.append(('gamma', str(chunk.body.gamma_int / 100000))) elif chunk.type == 'pHYs': aspectx = chunk.body.pixels_per_unit_x aspecty = chunk.body.pixels_per_unit_y - parts.append(tuple(['aspect', str(aspectx) + " x " + str(aspecty)])) + parts.append(('aspect', "{0} x {1}".format(aspectx, aspecty))) elif chunk.type == 'tEXt': - parts.append(tuple([chunk.body.keyword, chunk.body.text])) + parts.append((chunk.body.keyword, chunk.body.text)) elif chunk.type == 'iTXt': - parts.append(tuple([chunk.body.keyword, chunk.body.text])) + parts.append((chunk.body.keyword, chunk.body.text)) elif chunk.type == 'zTXt': - parts.append(tuple([chunk.body.keyword, chunk.body.text_datastream.decode('iso8859-1')])) + parts.append((chunk.body.keyword, chunk.body.text_datastream.decode('iso8859-1'))) return parts |