diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-19 13:45:19 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 13:45:19 +1300 |
| commit | 83dbefb224c0b0d77b226f80e37b5b3d6bebb703 (patch) | |
| tree | 4b96065dc5f7c7e904a731002a184ae890de4802 /mitmproxy/dump.py | |
| parent | 12cdc1577a8425660f5a018ca6c5a5dad5225826 (diff) | |
| parent | bce387a5a0d52f682f479b11cb40ae0918e070c0 (diff) | |
| download | mitmproxy-83dbefb224c0b0d77b226f80e37b5b3d6bebb703.tar.gz mitmproxy-83dbefb224c0b0d77b226f80e37b5b3d6bebb703.tar.bz2 mitmproxy-83dbefb224c0b0d77b226f80e37b5b3d6bebb703.zip | |
Merge pull request #1631 from cortesi/nomaster
Kill flow.master - create master.Master
Diffstat (limited to 'mitmproxy/dump.py')
| -rw-r--r-- | mitmproxy/dump.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py index e2167259..4731686c 100644 --- a/mitmproxy/dump.py +++ b/mitmproxy/dump.py @@ -6,6 +6,7 @@ from mitmproxy import exceptions from mitmproxy import flow from mitmproxy import builtins from mitmproxy import options +from mitmproxy import master from mitmproxy.builtins import dumper, termlog from netlib import tcp @@ -30,10 +31,10 @@ class Options(options.Options): super().__init__(**kwargs) -class DumpMaster(flow.FlowMaster): +class DumpMaster(master.Master): def __init__(self, options, server): - flow.FlowMaster.__init__(self, options, server) + master.Master.__init__(self, options, server) self.has_errored = False self.addons.add(termlog.TermLog()) self.addons.add(*builtins.default_addons()) |