aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/rawtcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-17 02:13:28 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-17 02:13:28 +0200
commit14a5f405fdf3973f05ca11182e927d145d10d8d6 (patch)
tree2843010882d64d928c0f53edffa9f8d48cee6da0 /libmproxy/protocol/rawtcp.py
parent8fbed971ae4a84e875f1072805b17cc7ada39fad (diff)
downloadmitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.gz
mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.bz2
mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.zip
use new netlib exceptions
Diffstat (limited to 'libmproxy/protocol/rawtcp.py')
-rw-r--r--libmproxy/protocol/rawtcp.py5
1 files changed, 3 insertions, 2 deletions
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))),