aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/test.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-06-05 20:52:11 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-06-05 20:52:11 +0200
commitf2db8abbe859266bb28117e1ffa4b0b99d62e321 (patch)
tree23815ce0131c03326c59ddaba52ddb08c2e55a5d /netlib/test.py
parent6c1c6f5f0ad375d5a8f37007e6cf2d6862282de9 (diff)
downloadmitmproxy-f2db8abbe859266bb28117e1ffa4b0b99d62e321.tar.gz
mitmproxy-f2db8abbe859266bb28117e1ffa4b0b99d62e321.tar.bz2
mitmproxy-f2db8abbe859266bb28117e1ffa4b0b99d62e321.zip
use open instead of file
Diffstat (limited to 'netlib/test.py')
-rw-r--r--netlib/test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/test.py b/netlib/test.py
index 4b0b6bd2..1e1b5e9d 100644
--- a/netlib/test.py
+++ b/netlib/test.py
@@ -75,13 +75,13 @@ class TServer(tcp.TCPServer):
raw_cert = self.ssl.get(
"cert",
tutils.test_data.path("data/server.crt"))
- cert = certutils.SSLCert.from_pem(file(raw_cert, "rb").read())
+ cert = certutils.SSLCert.from_pem(open(raw_cert, "rb").read())
raw_key = self.ssl.get(
"key",
tutils.test_data.path("data/server.key"))
key = OpenSSL.crypto.load_privatekey(
OpenSSL.crypto.FILETYPE_PEM,
- file(raw_key, "rb").read())
+ open(raw_key, "rb").read())
if self.ssl.get("v3_only", False):
method = tcp.SSLv3_METHOD
options = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_TLSv1