From 14a5f405fdf3973f05ca11182e927d145d10d8d6 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 17 Sep 2015 02:13:28 +0200 Subject: use new netlib exceptions --- libmproxy/protocol/rawtcp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libmproxy/protocol/rawtcp.py') diff --git a/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py index 24c19523..5f08fd17 100644 --- a/libmproxy/protocol/rawtcp.py +++ b/libmproxy/protocol/rawtcp.py @@ -5,8 +5,9 @@ import six import sys from OpenSSL import SSL +from netlib.exceptions import TcpException -from netlib.tcp import NetLibError, ssl_read_select +from netlib.tcp import ssl_read_select from netlib.utils import clean_bin from ..exceptions import ProtocolException from .base import Layer @@ -64,7 +65,7 @@ class RawTCPLayer(Layer): "info" ) - except (socket.error, NetLibError, SSL.Error) as e: + except (socket.error, TcpException, SSL.Error) as e: six.reraise( ProtocolException, ProtocolException("TCP connection closed unexpectedly: {}".format(repr(e))), -- cgit v1.2.3