aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_contentview.py2
-rw-r--r--test/mitmproxy/test_types_multidict.py (renamed from test/netlib/test_multidict.py)8
-rw-r--r--test/mitmproxy/test_types_serializable.py (renamed from test/netlib/test_basetypes.py)4
3 files changed, 7 insertions, 7 deletions
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index d63ee50e..f113e294 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -2,7 +2,7 @@ import mock
from mitmproxy.exceptions import ContentViewException
from netlib.http import Headers
from netlib.http import url
-from netlib import multidict
+from mitmproxy.types import multidict
import mitmproxy.contentviews as cv
from . import tutils
diff --git a/test/netlib/test_multidict.py b/test/mitmproxy/test_types_multidict.py
index a9523fd9..ada33bf7 100644
--- a/test/netlib/test_multidict.py
+++ b/test/mitmproxy/test_types_multidict.py
@@ -1,5 +1,5 @@
from netlib import tutils
-from netlib.multidict import MultiDict, ImmutableMultiDict, MultiDictView
+from mitmproxy.types import multidict
class _TMulti:
@@ -8,11 +8,11 @@ class _TMulti:
return key.lower()
-class TMultiDict(_TMulti, MultiDict):
+class TMultiDict(_TMulti, multidict.MultiDict):
pass
-class TImmutableMultiDict(_TMulti, ImmutableMultiDict):
+class TImmutableMultiDict(_TMulti, multidict.ImmutableMultiDict):
pass
@@ -238,7 +238,7 @@ class TParent:
class TestMultiDictView:
def test_modify(self):
p = TParent()
- tv = MultiDictView(p.getter, p.setter)
+ tv = multidict.MultiDictView(p.getter, p.setter)
assert len(tv) == 0
tv["a"] = "b"
assert p.vals == (("a", "b"),)
diff --git a/test/netlib/test_basetypes.py b/test/mitmproxy/test_types_serializable.py
index aa415784..dd4a3778 100644
--- a/test/netlib/test_basetypes.py
+++ b/test/mitmproxy/test_types_serializable.py
@@ -1,7 +1,7 @@
-from netlib import basetypes
+from mitmproxy.types import serializable
-class SerializableDummy(basetypes.Serializable):
+class SerializableDummy(serializable.Serializable):
def __init__(self, i):
self.i = i