aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-19 15:08:35 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-19 15:08:35 +1300
commit5a68d21e8c87e05f2ad0c18e6c7c505f5e9fc93d (patch)
tree12dff67cc2871d1e10c337e0eeaa6477cd888f3e /mitmproxy/dump.py
parent7c32d4ea2a435484e83aa459831f74ca483d8e3c (diff)
downloadmitmproxy-5a68d21e8c87e05f2ad0c18e6c7c505f5e9fc93d.tar.gz
mitmproxy-5a68d21e8c87e05f2ad0c18e6c7c505f5e9fc93d.tar.bz2
mitmproxy-5a68d21e8c87e05f2ad0c18e6c7c505f5e9fc93d.zip
Remove flow module entirely, move contents to top level
mitmproxy.flow.io -> mitmproxy.io mitmproxy.flow.export -> mitmproxy.export
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index e8b3126f..47f69303 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -3,8 +3,8 @@ from typing import Optional
from mitmproxy import controller
from mitmproxy import exceptions
-from mitmproxy import flow
from mitmproxy import addons
+from mitmproxy import io
from mitmproxy import options
from mitmproxy import master
from mitmproxy.addons import dumper, termlog
@@ -68,7 +68,7 @@ class DumpMaster(master.Master):
or raises a DumpError if that fails.
"""
try:
- return flow.read_flows_from_paths(paths)
+ return io.read_flows_from_paths(paths)
except exceptions.FlowReadException as e:
raise DumpError(str(e))