diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-12 10:55:47 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-12 10:55:47 -0300 |
| commit | 27950f19721ae68152b84d874702ca81f1b6ecee (patch) | |
| tree | 12573d1c3c9976d0b39016f3f45a0ef78c1a759d /libmproxy/flow.py | |
| parent | 30213d6370bca2bb222e315a63bf4d924a9b0b94 (diff) | |
| parent | e18294437c4629f26dc65e16a9252ef61a109284 (diff) | |
| download | mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.tar.gz mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.tar.bz2 mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.zip | |
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index f3b138e2..97ebc572 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -758,7 +758,7 @@ class FlowMaster(controller.Master): self.shutdown() self.client_playback.tick(self) - return controller.Master.tick(self, q, timeout) + return super(FlowMaster, self).tick(q, timeout) def duplicate_flow(self, f): return self.load_flow(f.copy()) |