diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-01-02 13:26:22 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-01-02 13:26:22 +1300 |
| commit | 1b5f5021dcb7cec45269a20fe9e8fdbea00600ed (patch) | |
| tree | 86f898fa39fdb56097a11abacfca083899eb8c62 /libmproxy/dump.py | |
| parent | 4d01e22f26dd301d2335a2dbb5890cdf38ca90e0 (diff) | |
| download | mitmproxy-1b5f5021dcb7cec45269a20fe9e8fdbea00600ed.tar.gz mitmproxy-1b5f5021dcb7cec45269a20fe9e8fdbea00600ed.tar.bz2 mitmproxy-1b5f5021dcb7cec45269a20fe9e8fdbea00600ed.zip | |
Consolidate reading flows from file, use in mitmweb.
Diffstat (limited to 'libmproxy/dump.py')
| -rw-r--r-- | libmproxy/dump.py | 11 |
1 files changed, 3 insertions, 8 deletions
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) |