aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadab Zafar <dufferzafar0@gmail.com>2016-06-21 23:53:59 +0530
committerShadab Zafar <dufferzafar0@gmail.com>2016-06-21 23:53:59 +0530
commit0a535509555ec76569ff69bc1553adbc501918d3 (patch)
tree60a403429f83070cc82c4f5cc974508f870248fd
parent10f4a36a5a845fbf49b519ff674acd1e6f132078 (diff)
downloadmitmproxy-0a535509555ec76569ff69bc1553adbc501918d3.tar.gz
mitmproxy-0a535509555ec76569ff69bc1553adbc501918d3.tar.bz2
mitmproxy-0a535509555ec76569ff69bc1553adbc501918d3.zip
mitmproxy.tnetstring -> mitmproxy.contrib.tnetstring
-rw-r--r--mitmproxy/contrib/tnetstring.py (renamed from mitmproxy/tnetstring.py)0
-rw-r--r--mitmproxy/flow/io.py2
-rw-r--r--test/mitmproxy/test_contrib_tnetstring.py (renamed from test/mitmproxy/test_tnetstring.py)2
-rw-r--r--test/mitmproxy/test_flow.py3
4 files changed, 4 insertions, 3 deletions
diff --git a/mitmproxy/tnetstring.py b/mitmproxy/contrib/tnetstring.py
index 9bf20b09..9bf20b09 100644
--- a/mitmproxy/tnetstring.py
+++ b/mitmproxy/contrib/tnetstring.py
diff --git a/mitmproxy/flow/io.py b/mitmproxy/flow/io.py
index cd3d9986..671ddf43 100644
--- a/mitmproxy/flow/io.py
+++ b/mitmproxy/flow/io.py
@@ -4,7 +4,7 @@ import os
from mitmproxy import exceptions
from mitmproxy import models
-from mitmproxy import tnetstring
+from mitmproxy.contrib import tnetstring
from mitmproxy.flow import io_compat
diff --git a/test/mitmproxy/test_tnetstring.py b/test/mitmproxy/test_contrib_tnetstring.py
index 0b16437b..17654ad9 100644
--- a/test/mitmproxy/test_tnetstring.py
+++ b/test/mitmproxy/test_contrib_tnetstring.py
@@ -4,7 +4,7 @@ import math
import io
import struct
-from mitmproxy import tnetstring
+from mitmproxy.contrib 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 af8256c4..9eaab9aa 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -5,7 +5,8 @@ import mock
import netlib.utils
from netlib.http import Headers
-from mitmproxy import filt, controller, tnetstring, flow
+from mitmproxy import filt, controller, flow
+from mitmproxy.contrib import tnetstring
from mitmproxy.exceptions import FlowReadException, ScriptException
from mitmproxy.models import Error
from mitmproxy.models import Flow