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 /examples/flowbasic | |
| 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 'examples/flowbasic')
| -rwxr-xr-x | examples/flowbasic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/flowbasic b/examples/flowbasic index 67c6f596..0eb163a4 100755 --- a/examples/flowbasic +++ b/examples/flowbasic @@ -12,10 +12,10 @@ from mitmproxy import flow, controller, options from mitmproxy.proxy import ProxyServer, ProxyConfig -class MyMaster(flow.FlowMaster): +class MyMaster(master.Master): def run(self): try: - flow.FlowMaster.run(self) + master.Master.run(self) except KeyboardInterrupt: self.shutdown() |