Skip to content

Commit 949728b

Browse files
committed
Close file descriptors after reading. Gives ResourceWarning in python
1 parent 0c75bc6 commit 949728b

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/jwkest/jwk.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ def sha512_digest(msg):
9090

9191

9292
def import_rsa_key_from_file(filename, passphrase=None):
93-
return RSA.importKey(open(filename, 'r').read(), passphrase=passphrase)
93+
content = None
94+
with open(filename, 'r') as f:
95+
content = f.read()
96+
97+
return RSA.importKey(content, passphrase=passphrase)
9498

9599

96100
def import_rsa_key(key, passphrase=None):
@@ -117,7 +121,10 @@ def der2rsa(der):
117121

118122
def pem_cert2rsa(pem_file):
119123
# Convert from PEM to DER
120-
pem = open(pem_file).read()
124+
pem = None
125+
with open(pem_file) as f:
126+
pem = f.read()
127+
121128
_rsa = RSA.importKey(pem)
122129
lines = pem.replace(" ", '').split()
123130
return der2rsa(a2b_base64(''.join(lines[1:-1])))
@@ -161,7 +168,9 @@ def load_x509_cert(url, spec2key):
161168

162169
def rsa_load(filename):
163170
"""Read a PEM-encoded RSA key pair from a file."""
164-
pem = open(filename, 'r').read()
171+
pem = None
172+
with open(filename, 'r') as f:
173+
pem = f.read()
165174
return import_rsa_key(pem)
166175

167176

0 commit comments

Comments
 (0)