From 1b5f5021dcb7cec45269a20fe9e8fdbea00600ed Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 2 Jan 2015 13:26:22 +1300 Subject: Consolidate reading flows from file, use in mitmweb. --- libmproxy/dump.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 731592dc..91ccb42b 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -134,16 +134,11 @@ class DumpMaster(flow.FlowMaster): raise DumpError(err) if options.rfile: - path = os.path.expanduser(options.rfile) try: - f = file(path, "rb") - freader = flow.FlowReader(f) - except IOError, v: - raise DumpError(v.strerror) - try: - self.load_flows(freader) + self.load_flows_file(options.rfile) except flow.FlowReadError, v: - self.add_event("Flow file corrupted. Stopped loading.", "error") + self.add_event("Flow file corrupted.", "error") + raise DumpError(v) if self.o.app: self.start_app(self.o.app_host, self.o.app_port) -- cgit v1.2.3