aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/base.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-11 02:17:04 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-11 02:17:04 +0200
commitdd414e485212e3cab612a66d5d858c1a766ace04 (patch)
tree0dd5dd8a4f0d963f5ba43884918bf42f9991c931 /libmproxy/protocol/base.py
parent40ce06e780aeb90a239c7af8b5231214d5d9f9d9 (diff)
downloadmitmproxy-dd414e485212e3cab612a66d5d858c1a766ace04.tar.gz
mitmproxy-dd414e485212e3cab612a66d5d858c1a766ace04.tar.bz2
mitmproxy-dd414e485212e3cab612a66d5d858c1a766ace04.zip
better error messages, remove error cause
Diffstat (limited to 'libmproxy/protocol/base.py')
-rw-r--r--libmproxy/protocol/base.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py
index 6793d3df..b92aeea1 100644
--- a/libmproxy/protocol/base.py
+++ b/libmproxy/protocol/base.py
@@ -1,6 +1,8 @@
from __future__ import (absolute_import, print_function, division)
-import six
import sys
+
+import six
+
from netlib import tcp
from ..models import ServerConnection
from ..exceptions import ProtocolException
@@ -176,8 +178,11 @@ class ServerConnectionMixin(object):
except tcp.NetLibError as e:
six.reraise(
ProtocolException,
- ProtocolException("Server connection to %s failed: %s" %
- (repr(self.server_conn.address), e), e),
+ ProtocolException(
+ "Server connection to {} failed: {}".format(
+ repr(self.server_conn.address), str(e)
+ )
+ ),
sys.exc_info()[2]
)