diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-06-15 15:35:36 -0700 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-06-15 15:35:36 -0700 |
| commit | 00cf88983765fd15d18825789d5c1befc7dbc840 (patch) | |
| tree | 5024eacdd4161af81086b4f7084b6c4acb989fd6 /test/test_certutils.py | |
| parent | 698f6f198d4ee35f51fe86d34bdb9986349fd702 (diff) | |
| parent | c9ab1c60b5d43f0b4d645c751350b16e9e562b55 (diff) | |
| download | mitmproxy-00cf88983765fd15d18825789d5c1befc7dbc840.tar.gz mitmproxy-00cf88983765fd15d18825789d5c1befc7dbc840.tar.bz2 mitmproxy-00cf88983765fd15d18825789d5c1befc7dbc840.zip | |
Merge pull request #15 from mhils/fix_binary_rw
always read files in binary mode
Diffstat (limited to 'test/test_certutils.py')
| -rw-r--r-- | test/test_certutils.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_certutils.py b/test/test_certutils.py index f57f8f6d..b335e946 100644 --- a/test/test_certutils.py +++ b/test/test_certutils.py @@ -54,22 +54,22 @@ class TestDummyCert: assert certutils.dummy_ca(cacert) p = os.path.join(d, "foo") certutils.dummy_cert( - file(p, "w"), + file(p, "wb"), cacert, "foo.com", ["one.com", "two.com", "*.three.com"] ) - assert file(p).read() + assert file(p,"rb").read() class TestSSLCert: def test_simple(self): - c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert"), "r").read()) + c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert"), "rb").read()) assert c.cn == "google.com" assert len(c.altnames) == 436 - c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_2"), "r").read()) + c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_2"), "rb").read()) assert c.cn == "www.inode.co.nz" assert len(c.altnames) == 2 assert c.digest("sha1") @@ -83,11 +83,11 @@ class TestSSLCert: c.has_expired def test_err_broken_sans(self): - c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_weird1"), "r").read()) + c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_weird1"), "rb").read()) # This breaks unless we ignore a decoding error. c.altnames def test_der(self): - d = file(tutils.test_data.path("data/dercert")).read() + d = file(tutils.test_data.path("data/dercert"),"rb").read() s = certutils.SSLCert.from_der(d) assert s.cn |