diff options
| author | Aldo Cortesi <aldo@corte.si> | 2017-12-18 08:14:07 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 08:14:07 +1300 |
| commit | 7dbe4209d91f3a39b3cf5da822a090eb3d48aa89 (patch) | |
| tree | d47400ce4b52d4417e6bc0374469459c643d6e32 /test | |
| parent | 9e4a443d4234149119e196ada3dbf2306173122e (diff) | |
| parent | 978b8d095c3106e973258376e4a15264288d20f2 (diff) | |
| download | mitmproxy-7dbe4209d91f3a39b3cf5da822a090eb3d48aa89.tar.gz mitmproxy-7dbe4209d91f3a39b3cf5da822a090eb3d48aa89.tar.bz2 mitmproxy-7dbe4209d91f3a39b3cf5da822a090eb3d48aa89.zip | |
Merge pull request #2690 from cortesi/types
mitmproxy.types -> mitmproxy.coretypes
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/contentviews/test_auto.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/contentviews/test_query.py | 2 | ||||
| -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): |