diff options
| author | Aldo Cortesi <aldo@corte.si> | 2017-03-20 12:50:09 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2017-03-20 12:50:09 +1300 |
| commit | 4ca78604af2a8ddb596e2f4e95090dabc8495bfe (patch) | |
| tree | fff817d49cd5f4d8a3989f64be94b13cac17fd67 | |
| parent | 3a8da31835db37d65637058935f144ece62c1bdd (diff) | |
| download | mitmproxy-4ca78604af2a8ddb596e2f4e95090dabc8495bfe.tar.gz mitmproxy-4ca78604af2a8ddb596e2f4e95090dabc8495bfe.tar.bz2 mitmproxy-4ca78604af2a8ddb596e2f4e95090dabc8495bfe.zip | |
Factor out an io module
Include tnetstring - we've made enough changes that this no longer belongs in
contrib.
| -rw-r--r-- | mitmproxy/io/__init__.py | 7 | ||||
| -rw-r--r-- | mitmproxy/io/compat.py (renamed from mitmproxy/io_compat.py) | 0 | ||||
| -rw-r--r-- | mitmproxy/io/io.py (renamed from mitmproxy/io.py) | 6 | ||||
| -rw-r--r-- | mitmproxy/io/tnetstring.py (renamed from mitmproxy/contrib/tnetstring.py) | 0 | ||||
| -rw-r--r-- | test/mitmproxy/io/test_compat.py (renamed from test/mitmproxy/test_io_compat.py) | 0 | ||||
| -rw-r--r-- | test/mitmproxy/io/test_io.py (renamed from test/mitmproxy/test_io.py) | 0 | ||||
| -rw-r--r-- | test/mitmproxy/io/test_tnetstring.py (renamed from test/mitmproxy/contrib/test_tnetstring.py) | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_flow.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_websocket.py | 2 |
9 files changed, 13 insertions, 6 deletions
diff --git a/mitmproxy/io/__init__.py b/mitmproxy/io/__init__.py new file mode 100644 index 00000000..a82f729f --- /dev/null +++ b/mitmproxy/io/__init__.py @@ -0,0 +1,7 @@ + +from .io import FlowWriter, FlowReader, FilteredFlowWriter, read_flows_from_paths + + +__all__ = [ + "FlowWriter", "FlowReader", "FilteredFlowWriter", "read_flows_from_paths" +]
\ No newline at end of file diff --git a/mitmproxy/io_compat.py b/mitmproxy/io/compat.py index 9d95f602..9d95f602 100644 --- a/mitmproxy/io_compat.py +++ b/mitmproxy/io/compat.py diff --git a/mitmproxy/io.py b/mitmproxy/io/io.py index 0f6c3f5c..50e26f49 100644 --- a/mitmproxy/io.py +++ b/mitmproxy/io/io.py @@ -7,9 +7,9 @@ from mitmproxy import flowfilter from mitmproxy import http from mitmproxy import tcp from mitmproxy import websocket -from mitmproxy.contrib import tnetstring -from mitmproxy import io_compat +from mitmproxy.io import compat +from mitmproxy.io import tnetstring FLOW_TYPES = dict( http=http.HTTPFlow, @@ -43,7 +43,7 @@ class FlowReader: tnetstring.load(self.fo), ) try: - mdata = io_compat.migrate_flow(loaded) + mdata = compat.migrate_flow(loaded) except ValueError as e: raise exceptions.FlowReadException(str(e)) if mdata["type"] not in FLOW_TYPES: diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/io/tnetstring.py index 24ce6ce8..24ce6ce8 100644 --- a/mitmproxy/contrib/tnetstring.py +++ b/mitmproxy/io/tnetstring.py diff --git a/test/mitmproxy/test_io_compat.py b/test/mitmproxy/io/test_compat.py index 288de4fc..288de4fc 100644 --- a/test/mitmproxy/test_io_compat.py +++ b/test/mitmproxy/io/test_compat.py diff --git a/test/mitmproxy/test_io.py b/test/mitmproxy/io/test_io.py index 777ab4dd..777ab4dd 100644 --- a/test/mitmproxy/test_io.py +++ b/test/mitmproxy/io/test_io.py diff --git a/test/mitmproxy/contrib/test_tnetstring.py b/test/mitmproxy/io/test_tnetstring.py index 05c4a7c9..f7141de0 100644 --- a/test/mitmproxy/contrib/test_tnetstring.py +++ b/test/mitmproxy/io/test_tnetstring.py @@ -4,7 +4,7 @@ import math import io import struct -from mitmproxy.contrib import tnetstring +from mitmproxy.io import tnetstring MAXINT = 2 ** (struct.Struct('i').size * 8 - 1) - 1 diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 630fc7e4..78f893c0 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -6,7 +6,7 @@ import mitmproxy.io from mitmproxy import flowfilter from mitmproxy import options from mitmproxy.proxy import config -from mitmproxy.contrib import tnetstring +from mitmproxy.io import tnetstring from mitmproxy.exceptions import FlowReadException from mitmproxy import flow from mitmproxy import http diff --git a/test/mitmproxy/test_websocket.py b/test/mitmproxy/test_websocket.py index 62f69e2d..7c53a4b0 100644 --- a/test/mitmproxy/test_websocket.py +++ b/test/mitmproxy/test_websocket.py @@ -1,7 +1,7 @@ import io import pytest -from mitmproxy.contrib import tnetstring +from mitmproxy.io import tnetstring from mitmproxy import flowfilter from mitmproxy.test import tflow |