diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-01-27 10:10:14 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-01-27 10:36:28 +0100 |
| commit | c2bb29f669cd80509f4efe205551a9cf5fc29770 (patch) | |
| tree | 0b5b71ecb430a2eaf6bcdca7cb8fa23e23ab2173 /libmproxy/protocol | |
| parent | 299c7fa34c6e5492dfcc0bb0e7b01e9dd2201b59 (diff) | |
| download | mitmproxy-c2bb29f669cd80509f4efe205551a9cf5fc29770.tar.gz mitmproxy-c2bb29f669cd80509f4efe205551a9cf5fc29770.tar.bz2 mitmproxy-c2bb29f669cd80509f4efe205551a9cf5fc29770.zip | |
cleanup imports
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 8 | ||||
| -rw-r--r-- | libmproxy/protocol/base.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/rawtcp.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/tls.py | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index d8ebd4f0..d46f16f5 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -28,12 +28,14 @@ as late as possible; this makes server replay without any outgoing connections p from __future__ import (absolute_import, print_function, division) from .base import Layer, ServerConnectionMixin, Kill from .http import Http1Layer, UpstreamConnectLayer, Http2Layer -from .tls import TlsLayer, is_tls_record_magic, TlsClientHello +from .tls import TlsLayer +from .tls import is_tls_record_magic +from .tls import TlsClientHello from .rawtcp import RawTCPLayer __all__ = [ "Layer", "ServerConnectionMixin", "Kill", "Http1Layer", "UpstreamConnectLayer", "Http2Layer", - "TlsLayer", "is_tls_record_magic", "TlsClientHello" - "RawTCPLayer" + "TlsLayer", "is_tls_record_magic", "TlsClientHello", + "RawTCPLayer", ] diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index d984cadb..c8433e07 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -3,7 +3,6 @@ import sys import six -from netlib import tcp from ..models import ServerConnection from ..exceptions import ProtocolException from netlib.exceptions import TcpException diff --git a/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py index ccd3c7ec..2902e03d 100644 --- a/libmproxy/protocol/rawtcp.py +++ b/libmproxy/protocol/rawtcp.py @@ -1,6 +1,5 @@ from __future__ import (absolute_import, print_function, division) import socket -import select import six import sys diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py index 6d4cac85..847ba263 100644 --- a/libmproxy/protocol/tls.py +++ b/libmproxy/protocol/tls.py @@ -5,7 +5,8 @@ import sys from construct import ConstructError import six -from netlib.exceptions import InvalidCertificateException, TcpException, TlsException +from netlib.exceptions import InvalidCertificateException +from netlib.exceptions import TlsException from ..contrib.tls._constructs import ClientHello from ..exceptions import ProtocolException, TlsProtocolException, ClientHandshakeException |