aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
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 /mitmproxy/master.py
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 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index b41e2a8d..5997ff6d 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -12,7 +12,7 @@ from mitmproxy import http
from mitmproxy import log
from mitmproxy.net import server_spec
from mitmproxy.proxy.protocol import http_replay
-from mitmproxy.types import basethread
+from mitmproxy.coretypes import basethread
from . import ctx as mitmproxy_ctx