diff options
| -rw-r--r-- | mitmproxy/contrib/kaitaistruct/png.py | 8 | ||||
| -rw-r--r-- | mitmproxy/tools/console/eventlog.py | 2 | ||||
| -rw-r--r-- | mitmproxy/tools/console/flowlist.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/mitmproxy/contrib/kaitaistruct/png.py b/mitmproxy/contrib/kaitaistruct/png.py index 98a70693..45074d70 100644 --- a/mitmproxy/contrib/kaitaistruct/png.py +++ b/mitmproxy/contrib/kaitaistruct/png.py @@ -34,9 +34,11 @@ class Png(KaitaiStruct): self.ihdr = self._root.IhdrChunk(self._io, self, self._root) self.ihdr_crc = self._io.read_bytes(4) self.chunks = [] - while not self._io.is_eof(): - self.chunks.append(self._root.Chunk(self._io, self, self._root)) - + while True: + _ = self._root.Chunk(self._io, self, self._root) + self.chunks.append(_) + if ((_.type == u"IEND") or (self._io.is_eof())) : + break class Rgb(KaitaiStruct): def __init__(self, _io, _parent=None, _root=None): diff --git a/mitmproxy/tools/console/eventlog.py b/mitmproxy/tools/console/eventlog.py index 0b8a3f8c..f5f48f88 100644 --- a/mitmproxy/tools/console/eventlog.py +++ b/mitmproxy/tools/console/eventlog.py @@ -23,7 +23,7 @@ class EventLog(urwid.ListBox): def keypress(self, size, key): if key == "z": - self.master.clear_events() + self.clear_events() key = None elif key == "m_end": self.set_focus(len(self.walker) - 1) diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py index 4184eeb4..c28f991b 100644 --- a/mitmproxy/tools/console/flowlist.py +++ b/mitmproxy/tools/console/flowlist.py @@ -69,7 +69,7 @@ class FlowItem(urwid.WidgetWrap): def mouse_event(self, size, event, button, col, row, focus): if event == "mouse press" and button == 1: if self.flow.request: - self.master.view_flow(self.flow) + self.master.commands.call("console.view.flow @focus") return True def keypress(self, xxx_todo_changeme, key): @@ -78,7 +78,7 @@ setup( "pyparsing>=2.1.3, <2.3", "pyperclip>=1.5.22, <1.6", "requests>=2.9.1, <3", - "ruamel.yaml>=0.13.2, <0.15", + "ruamel.yaml>=0.13.2, <0.16", "sortedcontainers>=1.5.4, <1.6", "tornado>=4.3, <4.6", "urwid>=1.3.1, <1.4", |