aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-12-17 13:31:36 +1300
committerAldo Cortesi <aldo@nullcube.com>2017-12-17 13:31:36 +1300
commit978b8d095c3106e973258376e4a15264288d20f2 (patch)
tree322e55936dad62d9b1090624c0707c89fa99a880 /test
parent1f6656ccb1e75822a84a8802b9bcbeb43709ba04 (diff)
downloadmitmproxy-978b8d095c3106e973258376e4a15264288d20f2.tar.gz
mitmproxy-978b8d095c3106e973258376e4a15264288d20f2.tar.bz2
mitmproxy-978b8d095c3106e973258376e4a15264288d20f2.zip
mitmproxy.types -> mitmproxy.coretypes
The types name is valuable, and we have a better use for it in collecting and exposing types for options and commands. The coretypes module should probably be split up anyway - it contains a threading base class, a few container objects, and the defintion of our serialization protocol. I was tempted to rename it to "uncagegorized" for the sake of honesty.
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/contentviews/test_auto.py2
-rw-r--r--test/mitmproxy/contentviews/test_query.py2
-rw-r--r--test/mitmproxy/coretypes/__init__.py (renamed from test/mitmproxy/types/__init__.py)0
-rw-r--r--test/mitmproxy/coretypes/test_basethread.py (renamed from test/mitmproxy/types/test_basethread.py)2
-rw-r--r--test/mitmproxy/coretypes/test_bidi.py (renamed from test/mitmproxy/types/test_bidi.py)2
-rw-r--r--test/mitmproxy/coretypes/test_multidict.py (renamed from test/mitmproxy/types/test_multidict.py)2
-rw-r--r--test/mitmproxy/coretypes/test_serializable.py (renamed from test/mitmproxy/types/test_serializable.py)2
7 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/contentviews/test_auto.py b/test/mitmproxy/contentviews/test_auto.py
index 2ff43139..cd888a2d 100644
--- a/test/mitmproxy/contentviews/test_auto.py
+++ b/test/mitmproxy/contentviews/test_auto.py
@@ -1,6 +1,6 @@
from mitmproxy.contentviews import auto
from mitmproxy.net import http
-from mitmproxy.types import multidict
+from mitmproxy.coretypes import multidict
from . import full_eval
diff --git a/test/mitmproxy/contentviews/test_query.py b/test/mitmproxy/contentviews/test_query.py
index d2bddd05..741b23f1 100644
--- a/test/mitmproxy/contentviews/test_query.py
+++ b/test/mitmproxy/contentviews/test_query.py
@@ -1,5 +1,5 @@
from mitmproxy.contentviews import query
-from mitmproxy.types import multidict
+from mitmproxy.coretypes import multidict
from . import full_eval
diff --git a/test/mitmproxy/types/__init__.py b/test/mitmproxy/coretypes/__init__.py
index e69de29b..e69de29b 100644
--- a/test/mitmproxy/types/__init__.py
+++ b/test/mitmproxy/coretypes/__init__.py
diff --git a/test/mitmproxy/types/test_basethread.py b/test/mitmproxy/coretypes/test_basethread.py
index a91588eb..4a383fea 100644
--- a/test/mitmproxy/types/test_basethread.py
+++ b/test/mitmproxy/coretypes/test_basethread.py
@@ -1,5 +1,5 @@
import re
-from mitmproxy.types import basethread
+from mitmproxy.coretypes import basethread
def test_basethread():
diff --git a/test/mitmproxy/types/test_bidi.py b/test/mitmproxy/coretypes/test_bidi.py
index e3a259fd..3bdad3c2 100644
--- a/test/mitmproxy/types/test_bidi.py
+++ b/test/mitmproxy/coretypes/test_bidi.py
@@ -1,5 +1,5 @@
import pytest
-from mitmproxy.types import bidi
+from mitmproxy.coretypes import bidi
def test_bidi():
diff --git a/test/mitmproxy/types/test_multidict.py b/test/mitmproxy/coretypes/test_multidict.py
index c76cd753..273d8ca2 100644
--- a/test/mitmproxy/types/test_multidict.py
+++ b/test/mitmproxy/coretypes/test_multidict.py
@@ -1,6 +1,6 @@
import pytest
-from mitmproxy.types import multidict
+from mitmproxy.coretypes import multidict
class _TMulti:
diff --git a/test/mitmproxy/types/test_serializable.py b/test/mitmproxy/coretypes/test_serializable.py
index 390d17e1..a316f876 100644
--- a/test/mitmproxy/types/test_serializable.py
+++ b/test/mitmproxy/coretypes/test_serializable.py
@@ -1,6 +1,6 @@
import copy
-from mitmproxy.types import serializable
+from mitmproxy.coretypes import serializable
class SerializableDummy(serializable.Serializable):