diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
| commit | 14a5f405fdf3973f05ca11182e927d145d10d8d6 (patch) | |
| tree | 2843010882d64d928c0f53edffa9f8d48cee6da0 /libmproxy/proxy/root_context.py | |
| parent | 8fbed971ae4a84e875f1072805b17cc7ada39fad (diff) | |
| download | mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.gz mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.bz2 mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.zip | |
use new netlib exceptions
Diffstat (limited to 'libmproxy/proxy/root_context.py')
| -rw-r--r-- | libmproxy/proxy/root_context.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/root_context.py b/libmproxy/proxy/root_context.py index 72243c59..48cb72a0 100644 --- a/libmproxy/proxy/root_context.py +++ b/libmproxy/proxy/root_context.py @@ -5,8 +5,8 @@ import sys import six from libmproxy.exceptions import ProtocolException +from netlib.exceptions import TcpException from netlib.http import ALPN_PROTO_H2, ALPN_PROTO_HTTP1 -from netlib.tcp import NetLibError from ..protocol import ( RawTCPLayer, TlsLayer, Http1Layer, Http2Layer, is_tls_record_magic, ServerConnectionMixin ) @@ -54,7 +54,7 @@ class RootContext(object): try: d = top_layer.client_conn.rfile.peek(3) - except NetLibError as e: + except TcpException as e: six.reraise(ProtocolException, ProtocolException(str(e)), sys.exc_info()[2]) client_tls = is_tls_record_magic(d) |