aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/test.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2013-11-19 05:03:10 +0100
committerMaximilian Hils <git@maximilianhils.com>2013-11-19 05:03:10 +0100
commit643602c066cdeac8653c28cf0c23f98a1c0ad7fe (patch)
treea8c7d93bc13f71de08c60958cbe79f921324263f /netlib/test.py
parent5e4ccbd7edc6eebf9eee25fd4d6ca64994ed6522 (diff)
parent28a0030c1ecacb8ac5c6e6453b6a22bdf94d9f7e (diff)
downloadmitmproxy-643602c066cdeac8653c28cf0c23f98a1c0ad7fe.tar.gz
mitmproxy-643602c066cdeac8653c28cf0c23f98a1c0ad7fe.tar.bz2
mitmproxy-643602c066cdeac8653c28cf0c23f98a1c0ad7fe.zip
Merge branch 'fix_windows_bugs' into fix_invalid_tcp_close
Diffstat (limited to 'netlib/test.py')
-rw-r--r--netlib/test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/test.py b/netlib/test.py
index 661395c5..87802bd5 100644
--- a/netlib/test.py
+++ b/netlib/test.py
@@ -52,7 +52,7 @@ class TServer(tcp.TCPServer):
self.last_handler = h
if self.ssl:
cert = certutils.SSLCert.from_pem(
- file(self.ssl["cert"], "r").read()
+ file(self.ssl["cert"], "rb").read()
)
if self.ssl["v3_only"]:
method = tcp.SSLv3_METHOD