Merge https://github.com/mitmproxy/mitmproxy

1 files changed, 6 insertions, 9 deletions

diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 538f42f0..99844cb7 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -68,6 +68,7 @@ def _mkhelp():
         ("x", "delete body"),
         ("z", "encode/decode a request/response"),
         ("tab", "next tab"),
+        ("h, l", "previous tab, next tab"),
         ("space", "next flow"),
         ("|", "run script on this flow"),
         ("/", "search (case sensitive)"),
@@ -434,6 +435,8 @@ class FlowView(tabs.Tabs):
         signals.flow_change.send(self, flow = self.flow)
 
     def keypress(self, size, key):
+        key = super(self.__class__, self).keypress(size, key)
+
         if key == " ":
             self.view_next_flow(self.flow)
             return
@@ -446,10 +449,7 @@ class FlowView(tabs.Tabs):
         else:
             conn = None
 
-        if key == "q":
-            signals.pop_view_state.send(self)
-            return None
-        elif key in ("up", "down", "page up", "page down"):
+        if key in ("up", "down", "page up", "page down"):
             # Why doesn't this just work??
             self._w.keypress(size, key)
         elif key == "a":
@@ -499,7 +499,7 @@ class FlowView(tabs.Tabs):
                 args = (self.flow,)
             )
 
-        if not conn and key in "befgmxvz":
+        if not conn and key in set(list("befgmxvz")):
             signals.status_message.send(
                 message = "Tab to the request or response",
                 expire = 1
@@ -601,10 +601,7 @@ class FlowView(tabs.Tabs):
                         args = (conn,)
                     )
                 signals.flow_change.send(self, flow = self.flow)
-            else:
-                return super(self.__class__, self).keypress(size, key)
-        else:
-            return super(self.__class__, self).keypress(size, key)
+        return key
 
     def encode_callback(self, key, conn):
         encoding_map = {