From 069aca1df4223416bc76883c37078e9f2deef28f Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 13 Jan 2014 14:20:34 +1300 Subject: Deprecate Flow.unload_script in favor of Flow.unload_scripts In the presence of arguments, unloading a single script is clumsy and less useful. --- libmproxy/flow.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libmproxy/flow.py') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index e0013f1e..4c778c40 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1394,9 +1394,10 @@ class FlowMaster(controller.Master): """ pass - def unload_script(self, script): - script.unload() - self.scripts.remove(script) + def unload_scripts(self): + for script in self.scripts[:]: + script.unload() + self.scripts.remove(script) def load_script(self, command): """ @@ -1627,8 +1628,7 @@ class FlowMaster(controller.Master): return f def shutdown(self): - for script in self.scripts: - self.unload_script(script) + self.unload_scripts() controller.Master.shutdown(self) if self.stream: for i in self.state._flow_list: -- cgit v1.2.3