Remove flow module entirely, move contents to top level

mitmproxy.flow.io -> mitmproxy.io
mitmproxy.flow.export -> mitmproxy.export

6 files changed, 23 insertions, 21 deletions

diff --git a/test/mitmproxy/addons/test_filestreamer.py b/test/mitmproxy/addons/test_filestreamer.py
index a85fcd0c..64208f84 100644
--- a/test/mitmproxy/addons/test_filestreamer.py
+++ b/test/mitmproxy/addons/test_filestreamer.py
@@ -4,7 +4,7 @@ import os.path
 
 from mitmproxy.addons import filestreamer
 from mitmproxy import master
-from mitmproxy.flow import io
+from mitmproxy import io
 from mitmproxy import options
 from mitmproxy import proxy
 
diff --git a/test/mitmproxy/mastertest.py b/test/mitmproxy/mastertest.py
index 915f9501..f82eec40 100644
--- a/test/mitmproxy/mastertest.py
+++ b/test/mitmproxy/mastertest.py
@@ -4,7 +4,7 @@ from . import tutils
 import netlib.tutils
 
 from mitmproxy import master
-from mitmproxy import flow, proxy, models, options
+from mitmproxy import io, proxy, models, options
 
 
 class TestMaster:
@@ -33,7 +33,7 @@ class MasterTest:
 
     def flowfile(self, path):
         f = open(path, "wb")
-        fw = flow.FlowWriter(f)
+        fw = io.FlowWriter(f)
         t = tutils.tflow(resp=True)
         fw.add(t)
         f.close()
diff --git a/test/mitmproxy/test_dump.py b/test/mitmproxy/test_dump.py
index a81fbd27..c062a068 100644
--- a/test/mitmproxy/test_dump.py
+++ b/test/mitmproxy/test_dump.py
@@ -1,7 +1,8 @@
 import os
 import io
 
-from mitmproxy import dump, flow, exceptions, proxy
+import mitmproxy.io
+from mitmproxy import dump, exceptions, proxy
 from . import tutils, mastertest
 
 
@@ -127,7 +128,7 @@ class TestDumpMaster(mastertest.MasterTest):
             self.dummy_cycle(
                 self.mkmaster(None, outfile=(p, "wb"), verbosity=0), 1, b""
             )
-            assert len(list(flow.FlowReader(open(p, "rb")).stream())) == 1
+            assert len(list(mitmproxy.io.FlowReader(open(p, "rb")).stream())) == 1
 
     def test_write_append(self):
         with tutils.tmpdir() as d:
@@ -140,7 +141,7 @@ class TestDumpMaster(mastertest.MasterTest):
                 self.mkmaster(None, outfile=(p, "ab"), verbosity=0),
                 1, b""
             )
-            assert len(list(flow.FlowReader(open(p, "rb")).stream())) == 2
+            assert len(list(mitmproxy.io.FlowReader(open(p, "rb")).stream())) == 2
 
     def test_write_err(self):
         tutils.raises(
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 86cd7d16..d33d395b 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -3,7 +3,8 @@ import io
 
 import netlib.utils
 from netlib.http import Headers
-from mitmproxy import flowfilter, flow, options
+import mitmproxy.io
+from mitmproxy import flowfilter, options
 from mitmproxy.addons import state
 from mitmproxy.contrib import tnetstring
 from mitmproxy.exceptions import FlowReadException, Kill
@@ -329,7 +330,7 @@ class TestSerialize:
 
     def _treader(self):
         sio = io.BytesIO()
-        w = flow.FlowWriter(sio)
+        w = mitmproxy.io.FlowWriter(sio)
         for i in range(3):
             f = tutils.tflow(resp=True)
             w.add(f)
@@ -342,18 +343,18 @@ class TestSerialize:
         w.add(f)
 
         sio.seek(0)
-        return flow.FlowReader(sio)
+        return mitmproxy.io.FlowReader(sio)
 
     def test_roundtrip(self):
         sio = io.BytesIO()
         f = tutils.tflow()
         f.marked = True
         f.request.content = bytes(bytearray(range(256)))
-        w = flow.FlowWriter(sio)
+        w = mitmproxy.io.FlowWriter(sio)
         w.add(f)
 
         sio.seek(0)
-        r = flow.FlowReader(sio)
+        r = mitmproxy.io.FlowReader(sio)
         l = list(r.stream())
         assert len(l) == 1
 
@@ -386,7 +387,7 @@ class TestSerialize:
     def test_filter(self):
         sio = io.BytesIO()
         flt = flowfilter.parse("~c 200")
-        w = flow.FilteredFlowWriter(sio, flt)
+        w = mitmproxy.io.FilteredFlowWriter(sio, flt)
 
         f = tutils.tflow(resp=True)
         f.response.status_code = 200
@@ -397,14 +398,14 @@ class TestSerialize:
         w.add(f)
 
         sio.seek(0)
-        r = flow.FlowReader(sio)
+        r = mitmproxy.io.FlowReader(sio)
         assert len(list(r.stream()))
 
     def test_error(self):
         sio = io.BytesIO()
         sio.write(b"bogus")
         sio.seek(0)
-        r = flow.FlowReader(sio)
+        r = mitmproxy.io.FlowReader(sio)
         tutils.raises(FlowReadException, list, r.stream())
 
         f = FlowReadException("foo")
@@ -418,7 +419,7 @@ class TestSerialize:
         tnetstring.dump(d, sio)
         sio.seek(0)
 
-        r = flow.FlowReader(sio)
+        r = mitmproxy.io.FlowReader(sio)
         tutils.raises("version", list, r.stream())
 
 
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index 920f538b..aafd5a1c 100644
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@@ -2,7 +2,7 @@ import re
 
 import netlib.tutils
 from netlib.http import Headers
-from mitmproxy.flow import export  # heh
+from mitmproxy import export  # heh
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py
index cc80db81..4997aff9 100644
--- a/test/mitmproxy/test_flow_format_compat.py
+++ b/test/mitmproxy/test_flow_format_compat.py
@@ -1,11 +1,11 @@
-from mitmproxy.flow import FlowReader
-from mitmproxy.exceptions import FlowReadException
+from mitmproxy import io
+from mitmproxy import exceptions
 from . import tutils
 
 
 def test_load():
     with open(tutils.test_data.path("data/dumpfile-011"), "rb") as f:
-        flow_reader = FlowReader(f)
+        flow_reader = io.FlowReader(f)
         flows = list(flow_reader.stream())
         assert len(flows) == 1
         assert flows[0].request.url == "https://example.com/"
@@ -13,6 +13,6 @@ def test_load():
 
 def test_cannot_convert():
     with open(tutils.test_data.path("data/dumpfile-010"), "rb") as f:
-        flow_reader = FlowReader(f)
-        with tutils.raises(FlowReadException):
+        flow_reader = io.FlowReader(f)
+        with tutils.raises(exceptions.FlowReadException):
             list(flow_reader.stream())