diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-15 17:53:29 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-15 17:53:29 +1300 |
commit | 394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf (patch) | |
tree | 2a52393abb5c2e7a86d04b9222f3bcf2ccadeedd /libmproxy/console.py | |
parent | e3ad3790dec1105824fa793ae9f7c927b6f81021 (diff) | |
download | mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.tar.gz mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.tar.bz2 mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.zip |
Interrupt interception when deleting an intercepting flow.
Prompting the user for this is annoying.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r-- | libmproxy/console.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index eaaa7b3a..78e81035 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -139,10 +139,6 @@ class ConnectionItem(WWrap): w = self.get_text() WWrap.__init__(self, w) - def intercept(self): - self.intercepting = True - self.w = self.get_text() - def get_text(self): return urwid.Text(format_flow(self.flow, self.focus)) @@ -159,8 +155,8 @@ class ConnectionItem(WWrap): elif key == "C": self.master.clear_connections() elif key == "d": - if not self.state.delete_flow(self.flow): - self.master.statusbar.message("Can't delete connection mid-intercept.") + self.flow.kill(self.master) + self.state.delete_flow(self.flow) self.master.sync_list_view() elif key == "r": r = self.master.replay_request(self.flow) @@ -178,7 +174,7 @@ class ConnectionItem(WWrap): self.flow ) elif key == "z": - self.master.kill_connection(self.flow) + self.flow.kill(self.master) elif key == "enter": if self.flow.request: self.master.view_flow(self.flow) @@ -1416,9 +1412,6 @@ class ConsoleMaster(flow.FlowMaster): self.state.delete_flow(f) self.sync_list_view() - def kill_connection(self, f): - f.kill(self) - def refresh_connection(self, c): if hasattr(self.header, "refresh_connection"): self.header.refresh_connection(c) |