From 81e3a6e8e661b212bf45fb37623556f2793d2184 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 14 Sep 2014 11:30:00 +1200 Subject: Super-basic outline for web io loop --- libmproxy/flow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmproxy/flow.py') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 794d4950..5954f6ac 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -596,7 +596,7 @@ class FlowMaster(controller.Master): return True return None - def tick(self, q): + def tick(self, q, timeout): if self.client_playback: e = [ self.client_playback.done(), @@ -605,9 +605,9 @@ class FlowMaster(controller.Master): ] if all(e): self.shutdown() - self.client_playback.tick(self) + self.client_playback.tick(self, timeout) - return controller.Master.tick(self, q) + return controller.Master.tick(self, q, timeout) def duplicate_flow(self, f): return self.load_flow(f.copy()) -- cgit v1.2.3