aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-09 10:10:10 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-09 10:10:10 +1200
commitb21df0cf44a270755dd419e1a5faee50dee9a48b (patch)
tree642b9de57307f56f0c88a13217470f71839ef8c5 /netlib/tcp.py
parent63c1efd3946ce672640b43b005d12f8f117d670a (diff)
parentdd2adc791d7d7d6be91789ec83a9be87c10fef24 (diff)
downloadmitmproxy-b21df0cf44a270755dd419e1a5faee50dee9a48b.tar.gz
mitmproxy-b21df0cf44a270755dd419e1a5faee50dee9a48b.tar.bz2
mitmproxy-b21df0cf44a270755dd419e1a5faee50dee9a48b.zip
Merge branch 'master' of ssh.github.com:cortesi/netlib
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 080797b4..c8a02ab4 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -289,7 +289,7 @@ class TCPClient(_Connection):
try:
self.connection.do_handshake()
except SSL.Error, v:
- raise NetLibError("SSL handshake error: %s"%str(v))
+ raise NetLibError("SSL handshake error: %s"%repr(v))
self.cert = certutils.SSLCert(self.connection.get_peer_certificate())
self.rfile.set_descriptor(self.connection)
self.wfile.set_descriptor(self.connection)
@@ -402,7 +402,7 @@ class BaseHandler(_Connection):
try:
self.connection.do_handshake()
except SSL.Error, v:
- raise NetLibError("SSL handshake error: %s"%str(v))
+ raise NetLibError("SSL handshake error: %s"%repr(v))
self.rfile.set_descriptor(self.connection)
self.wfile.set_descriptor(self.connection)