aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-03 17:01:25 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-03 17:01:25 +0200
commitf4272de5ec77fb57723e2274e4ddc50d73489e1e (patch)
tree2f7ad35411c29c15199f2498bb43571047c0d066 /libmproxy/proxy/server.py
parent1f6d05f89fada5fe360aa79abfa80a3c91ce54da (diff)
downloadmitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.tar.gz
mitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.tar.bz2
mitmproxy-f4272de5ec77fb57723e2274e4ddc50d73489e1e.zip
remove ServerConnectionMixin.reconnect
Diffstat (limited to 'libmproxy/proxy/server.py')
-rw-r--r--libmproxy/proxy/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index e9e8df09..5d067b45 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -8,10 +8,10 @@ from netlib import tcp
from netlib.http.http1 import HTTP1Protocol
from netlib.tcp import NetLibError
from ..exceptions import ProtocolException, ServerException
-from ..protocol import Log, Kill
+from ..protocol import Kill
from ..models import ClientConnection, make_error_response
from .modes import HttpUpstreamProxy, HttpProxy, ReverseProxy, TransparentProxy, Socks5Proxy
-from .root_context import RootContext
+from .root_context import RootContext, Log
class DummyServer: