Fix and cleanup

2 files changed, 12 insertions, 10 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
diff --git a/mitmproxy/contentviews/image/png.py b/mitmproxy/contrib/kaitaistruct/png.py
index 53d39799..5b0e3ca3 100644
--- a/mitmproxy/contentviews/image/png.py
+++ b/mitmproxy/contrib/kaitaistruct/png.py
@@ -1,5 +1,5 @@
 # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
-# The source was png.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/tree/master/image
+# The source was png.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/9370c720b7d2ad329102d89bdc880ba6a706ef26/image/png.ksy
 
 import array
 import struct
@@ -262,7 +262,7 @@ class Png(KaitaiStruct):
             self.keyword = self._io.read_strz("UTF-8", 0, False, True, True)
             self.compression_flag = self._io.read_u1()
             self.compression_method = self._io.read_u1()
-            self.language_tag = self._io.read_strz("iso8859-1", 0, False, True, True)
+            self.language_tag = self._io.read_strz("ASCII", 0, False, True, True)
             self.translated_keyword = self._io.read_strz("UTF-8", 0, False, True, True)
             self.text = self._io.read_str_eos("UTF-8")