Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 02:10:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1695 from cortesi/term

Browse Source 
console: Minor cleanups
This commit is contained in:
Aldo Cortesi 2016-11-01 10:09:36 +13:00 committed by GitHub
commit 2c85b262d5
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mitmproxy/tools/console/master.py
View File

@ -3,7 +3,6 @@ import mimetypes
import os import os
import os.path import os.path
import shlex import shlex
import signal
import stat import stat
import subprocess import subprocess
import sys import sys
@ -256,7 +255,6 @@ class ConsoleMaster(master.Master):
changed = self.tick(timeout=0) changed = self.tick(timeout=0)
if changed: if changed:
self.loop.draw_screen() self.loop.draw_screen()
signals.update_settings.send()
self.loop.set_alarm_in(0.01, self.ticker) self.loop.set_alarm_in(0.01, self.ticker)
def run(self): def run(self):
@ -293,13 +291,6 @@ class ConsoleMaster(master.Master):
) )
self.loop.set_alarm_in(0.01, http2err) self.loop.set_alarm_in(0.01, http2err)
# It's not clear why we need to handle this explicitly - without this,
# mitmproxy hangs on keyboard interrupt. Remove if we ever figure it
# out.
def exit(s, f):
raise urwid.ExitMainLoop
signal.signal(signal.SIGINT, exit)
self.loop.set_alarm_in( self.loop.set_alarm_in(
0.0001, 0.0001,
lambda *args: self.view_flowlist() lambda *args: self.view_flowlist()
@ -316,8 +307,9 @@ class ConsoleMaster(master.Master):
print("Please lodge a bug report at:", file=sys.stderr) print("Please lodge a bug report at:", file=sys.stderr)
print("\thttps://github.com/mitmproxy/mitmproxy", file=sys.stderr) print("\thttps://github.com/mitmproxy/mitmproxy", file=sys.stderr)
print("Shutting down...", file=sys.stderr) print("Shutting down...", file=sys.stderr)
sys.stderr.flush() finally:
self.shutdown() sys.stderr.flush()
self.shutdown()
def view_help(self, helpctx): def view_help(self, helpctx):
signals.push_view_state.send( signals.push_view_state.send(