From 729fd9301f03550a253a8f44e095bb5b1d3f3152 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 9 Jul 2012 10:26:45 +1200 Subject: Use FlowMaster stream from mitmdump. --- libmproxy/dump.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libmproxy/dump.py b/libmproxy/dump.py index a58405ed..1f90184b 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -91,7 +91,7 @@ class DumpMaster(flow.FlowMaster): path = os.path.expanduser(options.wfile) try: f = file(path, "wb") - self.fwriter = flow.FlowWriter(f) + self.start_stream(f) except IOError, v: raise DumpError(v.strerror) @@ -203,10 +203,7 @@ class DumpMaster(flow.FlowMaster): print >> self.outfile, "\n" if self.o.verbosity: self.outfile.flush() - self.state.delete_flow(f) - if self.o.wfile: - self.fwriter.add(f) def handle_response(self, msg): f = flow.FlowMaster.handle_response(self, msg) @@ -222,8 +219,6 @@ class DumpMaster(flow.FlowMaster): return f def shutdown(self): # pragma: no cover - if self.o.wfile: - self.fwriter.fo.close() return flow.FlowMaster.shutdown(self) def run(self): # pragma: no cover -- cgit v1.2.3