always use with statement to open files

This commit is contained in:
Maximilian Hils 2014-08-16 18:35:58 +02:00
parent 6d1b601ddf
commit f93cd6a335

View File

@ -116,11 +116,15 @@ class TestDummyCert:
class TestSSLCert: class TestSSLCert:
def test_simple(self): def test_simple(self):
c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert"), "rb").read()) with open(tutils.test_data.path("data/text_cert"), "rb") as f:
d = f.read()
c = certutils.SSLCert.from_pem(d)
assert c.cn == "google.com" assert c.cn == "google.com"
assert len(c.altnames) == 436 assert len(c.altnames) == 436
c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_2"), "rb").read()) with open(tutils.test_data.path("data/text_cert_2"), "rb") as f:
d = f.read()
c = certutils.SSLCert.from_pem(d)
assert c.cn == "www.inode.co.nz" assert c.cn == "www.inode.co.nz"
assert len(c.altnames) == 2 assert len(c.altnames) == 2
assert c.digest("sha1") assert c.digest("sha1")
@ -134,12 +138,15 @@ class TestSSLCert:
c.has_expired c.has_expired
def test_err_broken_sans(self): def test_err_broken_sans(self):
c = certutils.SSLCert.from_pem(file(tutils.test_data.path("data/text_cert_weird1"), "rb").read()) with open(tutils.test_data.path("data/text_cert_weird1"), "rb") as f:
d = f.read()
c = certutils.SSLCert.from_pem(d)
# This breaks unless we ignore a decoding error. # This breaks unless we ignore a decoding error.
c.altnames c.altnames
def test_der(self): def test_der(self):
d = file(tutils.test_data.path("data/dercert"),"rb").read() with open(tutils.test_data.path("data/dercert"), "rb") as f:
d = f.read()
s = certutils.SSLCert.from_der(d) s = certutils.SSLCert.from_der(d)
assert s.cn assert s.cn