From 9695377b283f97c872e4ddbb27060883c3c32980 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Mon, 5 Jan 2015 18:12:38 -0300 Subject: first steps in scenario support --- libmproxy/dump.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 91ccb42b..c4a70a14 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -143,11 +143,13 @@ class DumpMaster(flow.FlowMaster): if self.o.app: self.start_app(self.o.app_host, self.o.app_port) - def _readflow(self, path): - path = os.path.expanduser(path) + def _readflow(self, paths): try: - f = file(path, "rb") - flows = list(flow.FlowReader(f).stream()) + flows = [] + for path in paths: + path = os.path.expanduser(path) + f = file(path, "rb") + flows.extend(list(flow.FlowReader(f).stream())) except (IOError, flow.FlowReadError), v: raise DumpError(v.strerror) return flows -- cgit v1.2.3 From 4f578866fac9e8261ad659d9a04c87822d7c9aab Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Mon, 12 Jan 2015 14:31:18 -0300 Subject: open flow files using with as max suggested --- libmproxy/dump.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index c4a70a14..70f175f6 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -148,8 +148,8 @@ class DumpMaster(flow.FlowMaster): flows = [] for path in paths: path = os.path.expanduser(path) - f = file(path, "rb") - flows.extend(list(flow.FlowReader(f).stream())) + with file(path, "rb") as f: + flows.extend(list(flow.FlowReader(f).stream())) except (IOError, flow.FlowReadError), v: raise DumpError(v.strerror) return flows -- cgit v1.2.3