From 978b8d095c3106e973258376e4a15264288d20f2 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 17 Dec 2017 13:31:36 +1300 Subject: 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. --- pathod/pathoc.py | 2 +- pathod/protocols/http2.py | 2 +- pathod/test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pathod') diff --git a/pathod/pathoc.py b/pathod/pathoc.py index 20a915c0..e5fe4c2d 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -17,7 +17,7 @@ from mitmproxy.net import tcp, tls from mitmproxy.net import websockets from mitmproxy.net import socks from mitmproxy.net import http as net_http -from mitmproxy.types import basethread +from mitmproxy.coretypes import basethread from mitmproxy.utils import strutils from pathod import log diff --git a/pathod/protocols/http2.py b/pathod/protocols/http2.py index cfc71650..c56d304d 100644 --- a/pathod/protocols/http2.py +++ b/pathod/protocols/http2.py @@ -8,7 +8,7 @@ from mitmproxy.net.http import http2 import mitmproxy.net.http.headers import mitmproxy.net.http.response import mitmproxy.net.http.request -from mitmproxy.types import bidi +from mitmproxy.coretypes import bidi from .. import language diff --git a/pathod/test.py b/pathod/test.py index 52f3ba02..819c7a94 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -2,7 +2,7 @@ import io import time import queue from . import pathod -from mitmproxy.types import basethread +from mitmproxy.coretypes import basethread import typing # noqa -- cgit v1.2.3