mitmproxy.protocol -> mitmproxy.proxy.protocol

The protocols here are compltely proxy-specific, are only used from within the
proxy module, and are not exposed to users.

19 files changed, 25 insertions, 25 deletions

diff --git a/docs/scripting/events.rst b/docs/scripting/events.rst
index c16c01f6..62266485 100644
--- a/docs/scripting/events.rst
+++ b/docs/scripting/events.rst
@@ -56,7 +56,7 @@ Connection
           connection can correspond to multiple HTTP requests.
 
           *root_layer*
-            The root layer (see `mitmproxy.protocol` for an explanation what
+            The root layer (see `mitmproxy.proxy.protocol` for an explanation what
             the root layer is), provides transparent access to all attributes
             of the :py:class:`~mitmproxy.proxy.RootContext`. For example,
             ``root_layer.client_conn.address`` gives the remote address of the
diff --git a/examples/tls_passthrough.py b/examples/tls_passthrough.py
index 445ea5c3..40c1051d 100644
--- a/examples/tls_passthrough.py
+++ b/examples/tls_passthrough.py
@@ -28,7 +28,7 @@ from enum import Enum
 
 import mitmproxy
 from mitmproxy.exceptions import TlsProtocolException
-from mitmproxy.protocol import TlsLayer, RawTCPLayer
+from mitmproxy.proxy.protocol import TlsLayer, RawTCPLayer
 
 
 class InterceptionResult(Enum):
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index 672ff1e8..1fc00112 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -13,7 +13,7 @@ from mitmproxy import connections
 from mitmproxy import http
 from mitmproxy import log
 from mitmproxy import io
-from mitmproxy.protocol import http_replay
+from mitmproxy.proxy.protocol import http_replay
 from netlib import basethread
 import netlib.http
 
diff --git a/mitmproxy/proxy/modes/http_proxy.py b/mitmproxy/proxy/modes/http_proxy.py
index 37e7f04f..d4fb9d68 100644
--- a/mitmproxy/proxy/modes/http_proxy.py
+++ b/mitmproxy/proxy/modes/http_proxy.py
@@ -1,4 +1,4 @@
-from mitmproxy import protocol
+from mitmproxy.proxy import protocol
 
 
 class HttpProxy(protocol.Layer, protocol.ServerConnectionMixin):
diff --git a/mitmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/proxy/modes/reverse_proxy.py
index 453b7d05..87d5d8c8 100644
--- a/mitmproxy/proxy/modes/reverse_proxy.py
+++ b/mitmproxy/proxy/modes/reverse_proxy.py
@@ -1,4 +1,4 @@
-from mitmproxy import protocol
+from mitmproxy.proxy import protocol
 
 
 class ReverseProxy(protocol.Layer, protocol.ServerConnectionMixin):
diff --git a/mitmproxy/proxy/modes/socks_proxy.py b/mitmproxy/proxy/modes/socks_proxy.py
index f6537b9e..4f8473bd 100644
--- a/mitmproxy/proxy/modes/socks_proxy.py
+++ b/mitmproxy/proxy/modes/socks_proxy.py
@@ -1,6 +1,6 @@
 import netlib.exceptions
 from mitmproxy import exceptions
-from mitmproxy import protocol
+from mitmproxy.proxy import protocol
 from netlib import socks
 
 
diff --git a/mitmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/proxy/modes/transparent_proxy.py
index 2fb19b44..ae532235 100644
--- a/mitmproxy/proxy/modes/transparent_proxy.py
+++ b/mitmproxy/proxy/modes/transparent_proxy.py
@@ -1,6 +1,6 @@
 from mitmproxy import exceptions
 from mitmproxy import platform
-from mitmproxy import protocol
+from mitmproxy.proxy import protocol
 
 
 class TransparentProxy(protocol.Layer, protocol.ServerConnectionMixin):
diff --git a/mitmproxy/protocol/__init__.py b/mitmproxy/proxy/protocol/__init__.py
index 89b60386..89b60386 100644
--- a/mitmproxy/protocol/__init__.py
+++ b/mitmproxy/proxy/protocol/__init__.py
diff --git a/mitmproxy/protocol/base.py b/mitmproxy/proxy/protocol/base.py
index 53cfd137..00d50721 100644
--- a/mitmproxy/protocol/base.py
+++ b/mitmproxy/proxy/protocol/base.py
@@ -22,7 +22,7 @@ class _LayerCodeCompletion:
         self.channel = None
         """@type: mitmproxy.controller.Channel"""
         self.ctx = None
-        """@type: mitmproxy.protocol.Layer"""
+        """@type: mitmproxy.proxy.protocol.Layer"""
 
 
 class Layer(_LayerCodeCompletion):
diff --git a/mitmproxy/protocol/http.py b/mitmproxy/proxy/protocol/http.py
index 325bf815..ec018f89 100644
--- a/mitmproxy/protocol/http.py
+++ b/mitmproxy/proxy/protocol/http.py
@@ -5,8 +5,8 @@ import traceback
 from mitmproxy import exceptions
 from mitmproxy import http
 from mitmproxy import flow
-from mitmproxy.protocol import base
-from mitmproxy.protocol import websockets as pwebsockets
+from mitmproxy.proxy.protocol import base
+from mitmproxy.proxy.protocol import websockets as pwebsockets
 import netlib.http
 from netlib import tcp
 from netlib import websockets
diff --git a/mitmproxy/protocol/http1.py b/mitmproxy/proxy/protocol/http1.py
index c0084804..968d3249 100644
--- a/mitmproxy/protocol/http1.py
+++ b/mitmproxy/proxy/protocol/http1.py
@@ -1,5 +1,5 @@
 from mitmproxy import http
-from mitmproxy.protocol import http as httpbase
+from mitmproxy.proxy.protocol import http as httpbase
 from netlib.http import http1
 
 
diff --git a/mitmproxy/protocol/http2.py b/mitmproxy/proxy/protocol/http2.py
index a3ec03f4..cbd8b34c 100644
--- a/mitmproxy/protocol/http2.py
+++ b/mitmproxy/proxy/protocol/http2.py
@@ -11,8 +11,8 @@ import queue
 import netlib.exceptions
 from mitmproxy import exceptions
 from mitmproxy import http
-from mitmproxy.protocol import base
-from mitmproxy.protocol import http as httpbase
+from mitmproxy.proxy.protocol import base
+from mitmproxy.proxy.protocol import http as httpbase
 import netlib.http
 from netlib import tcp
 from netlib import basethread
diff --git a/mitmproxy/protocol/http_replay.py b/mitmproxy/proxy/protocol/http_replay.py
index 952c1817..bf0697be 100644
--- a/mitmproxy/protocol/http_replay.py
+++ b/mitmproxy/proxy/protocol/http_replay.py
@@ -11,7 +11,7 @@ from netlib.http import http1
 from netlib import basethread
 
 
-# TODO: Doesn't really belong into mitmproxy.protocol...
+# TODO: Doesn't really belong into mitmproxy.proxy.protocol...
 
 
 class RequestReplayThread(basethread.BaseThread):
diff --git a/mitmproxy/protocol/rawtcp.py b/mitmproxy/proxy/protocol/rawtcp.py
index 3bd7b162..513b90b3 100644
--- a/mitmproxy/protocol/rawtcp.py
+++ b/mitmproxy/proxy/protocol/rawtcp.py
@@ -6,7 +6,7 @@ import netlib.exceptions
 import netlib.tcp
 from mitmproxy import tcp
 from mitmproxy import flow
-from mitmproxy.protocol import base
+from mitmproxy.proxy.protocol import base
 
 
 class RawTCPLayer(base.Layer):
diff --git a/mitmproxy/protocol/tls.py b/mitmproxy/proxy/protocol/tls.py
index b287bb51..940ab9ea 100644
--- a/mitmproxy/protocol/tls.py
+++ b/mitmproxy/proxy/protocol/tls.py
@@ -6,7 +6,7 @@ import construct
 import netlib.exceptions
 from mitmproxy import exceptions
 from mitmproxy.contrib.tls import _constructs
-from mitmproxy.protocol import base
+from mitmproxy.proxy.protocol import base
 from netlib import utils
 
 
@@ -283,7 +283,7 @@ class TlsClientHello:
         client_conn:
             The :py:class:`client connection <mitmproxy.connections.ClientConnection>`.
         Returns:
-            :py:class:`client hello <mitmproxy.protocol.tls.TlsClientHello>`.
+            :py:class:`client hello <mitmproxy.proxy.protocol.tls.TlsClientHello>`.
         """
         try:
             raw_client_hello = get_client_hello(client_conn)[4:]  # exclude handshake header.
diff --git a/mitmproxy/protocol/websockets.py b/mitmproxy/proxy/protocol/websockets.py
index 23b21d22..816ec92d 100644
--- a/mitmproxy/protocol/websockets.py
+++ b/mitmproxy/proxy/protocol/websockets.py
@@ -3,7 +3,7 @@ import socket
 import struct
 from OpenSSL import SSL
 from mitmproxy import exceptions
-from mitmproxy.protocol import base
+from mitmproxy.proxy.protocol import base
 from netlib import strutils
 from netlib import tcp
 from netlib import websockets
diff --git a/mitmproxy/proxy/root_context.py b/mitmproxy/proxy/root_context.py
index fa4fae47..6a99d9cf 100644
--- a/mitmproxy/proxy/root_context.py
+++ b/mitmproxy/proxy/root_context.py
@@ -1,7 +1,7 @@
 import netlib.exceptions
 from mitmproxy import log
 from mitmproxy import exceptions
-from mitmproxy import protocol
+from mitmproxy.proxy import protocol
 from mitmproxy.proxy import modes
 
 
diff --git a/test/mitmproxy/addons/test_clientplayback.py b/test/mitmproxy/addons/test_clientplayback.py
index c5407d18..f15b6290 100644
--- a/test/mitmproxy/addons/test_clientplayback.py
+++ b/test/mitmproxy/addons/test_clientplayback.py
@@ -14,7 +14,7 @@ class TestClientPlayback:
         f = tutils.tflow(resp=True)
         cp.load([f])
         assert cp.count() == 1
-        RP = "mitmproxy.protocol.http_replay.RequestReplayThread"
+        RP = "mitmproxy.proxy.protocol.http_replay.RequestReplayThread"
         with mock.patch(RP) as rp:
             assert not cp.current
             with mastertest.mockctx():
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index 9724516b..eb0c90e9 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -92,10 +92,10 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
     """
     @type client_conn: bool | None | mitmproxy.proxy.connection.ClientConnection
     @type server_conn: bool | None | mitmproxy.proxy.connection.ServerConnection
-    @type req:         bool | None | mitmproxy.protocol.http.HTTPRequest
-    @type resp:        bool | None | mitmproxy.protocol.http.HTTPResponse
-    @type err:         bool | None | mitmproxy.protocol.primitives.Error
-    @return:           mitmproxy.protocol.http.HTTPFlow
+    @type req:         bool | None | mitmproxy.proxy.protocol.http.HTTPRequest
+    @type resp:        bool | None | mitmproxy.proxy.protocol.http.HTTPResponse
+    @type err:         bool | None | mitmproxy.proxy.protocol.primitives.Error
+    @return:           mitmproxy.proxy.protocol.http.HTTPFlow
     """
     if client_conn is True:
         client_conn = tclient_conn()
@@ -160,7 +160,7 @@ def tserver_conn():
 
 def terr(content="error"):
     """
-    @return: mitmproxy.protocol.primitives.Error
+    @return: mitmproxy.proxy.protocol.primitives.Error
     """
     err = flow.Error(content)
     return err