diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 12:01:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 12:01:46 +1200 |
| commit | e4f043f69c9528e08403cb9075cf5c182be82aae (patch) | |
| tree | 335c4e3e6d354fa89e24d3a5d1766346558e2c32 /mitmproxy/flow.py | |
| parent | ed415877d48251774012bd6aad4be91e9d558b79 (diff) | |
| download | mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.tar.gz mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.tar.bz2 mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.zip | |
Flatten ServerMaster into Master
Diffstat (limited to 'mitmproxy/flow.py')
| -rw-r--r-- | mitmproxy/flow.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py index 1b4a999a..716d9a17 100644 --- a/mitmproxy/flow.py +++ b/mitmproxy/flow.py @@ -638,7 +638,7 @@ class State(object): self.flows.kill_all(master) -class FlowMaster(controller.ServerMaster): +class FlowMaster(controller.Master): @property def server(self): |