aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/base.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/base.py
parent8fbed971ae4a84e875f1072805b17cc7ada39fad (diff)
downloadmitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.gz
mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.bz2
mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.zip
use new netlib exceptions
Diffstat (limited to 'libmproxy/protocol/base.py')
-rw-r--r--libmproxy/protocol/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py
index b92aeea1..af6b1c3b 100644
--- a/libmproxy/protocol/base.py
+++ b/libmproxy/protocol/base.py
@@ -6,6 +6,7 @@ import six
from netlib import tcp
from ..models import ServerConnection
from ..exceptions import ProtocolException
+from netlib.exceptions import TcpException
class _LayerCodeCompletion(object):
@@ -175,7 +176,7 @@ class ServerConnectionMixin(object):
self.channel.ask("serverconnect", self.server_conn)
try:
self.server_conn.connect()
- except tcp.NetLibError as e:
+ except TcpException as e:
six.reraise(
ProtocolException,
ProtocolException(