Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

console: fix master invocation order

This commit is contained in:
Aldo Cortesi 2016-10-19 23:16:18 +13:00
parent e73c7fe77e
commit 9e7438fb18
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ class ConsoleMaster(master.Master):
palette = [] palette = []
def __init__(self, options, server): def __init__(self, options, server):
master.Master.__init__(self, options, server) super().__init__(options, server)
self.state = ConsoleState() self.state = ConsoleState()
self.stream_path = None self.stream_path = None
# This line is just for type hinting # This line is just for type hinting

2
mitmproxy/tools/main.py
View File

@ -68,7 +68,7 @@ def mitmproxy(args=None): # pragma: no cover
console_options.no_mouse = args.no_mouse console_options.no_mouse = args.no_mouse
server = process_options(parser, console_options, args) server = process_options(parser, console_options, args)
m = console.master.ConsoleMaster(server, console_options) m = console.master.ConsoleMaster(console_options, server)
except exceptions.OptionsError as e: except exceptions.OptionsError as e:
print("mitmproxy: %s" % e, file=sys.stderr) print("mitmproxy: %s" % e, file=sys.stderr)
sys.exit(1) sys.exit(1)