aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-07-09 10:26:45 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-07-09 10:26:45 +1200
commit729fd9301f03550a253a8f44e095bb5b1d3f3152 (patch)
tree0be4dd0b35c3fc0b18cb57fe436ecd99bdebda0d
parentbbd9acf55123edd67d0b8033c3bd54b8e0a2c6cf (diff)
downloadmitmproxy-729fd9301f03550a253a8f44e095bb5b1d3f3152.tar.gz
mitmproxy-729fd9301f03550a253a8f44e095bb5b1d3f3152.tar.bz2
mitmproxy-729fd9301f03550a253a8f44e095bb5b1d3f3152.zip
Use FlowMaster stream from mitmdump.
-rw-r--r--libmproxy/dump.py7
1 files changed, 1 insertions, 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