diff --git a/letsencrypt/client/challenge_util.py b/letsencrypt/client/challenge_util.py index 69f351f7d..46b0602be 100644 --- a/letsencrypt/client/challenge_util.py +++ b/letsencrypt/client/challenge_util.py @@ -36,7 +36,7 @@ def dvsni_gen_cert(filepath, name, r_b64, nonce, key): key.pem, [nonce + CONFIG.INVALID_EXT, name, ext]) with open(filepath, 'w') as chall_cert_file: - chall_cert_file.write(cert_pem) + chall_cert_file.write(cert_pem) return le_util.jose_b64encode(dvsni_s) diff --git a/letsencrypt/client/recovery_token_challenge.py b/letsencrypt/client/recovery_token_challenge.py index 04a3d3ec9..56d401dad 100644 --- a/letsencrypt/client/recovery_token_challenge.py +++ b/letsencrypt/client/recovery_token_challenge.py @@ -3,9 +3,8 @@ .. note:: This challenge has not been implemented into the project yet """ -import display - from letsencrypt.client import challenge +from letsencrypt.client import display class RecoveryToken(challenge.Challenge): diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py index 9030d8f69..19c34cc64 100755 --- a/letsencrypt/scripts/main.py +++ b/letsencrypt/scripts/main.py @@ -201,7 +201,7 @@ def read_file(filename): """ try: - return filename, file(filename, 'rU').read() + return filename, open(filename, 'rU').read() except IOError as exc: raise argparse.ArgumentTypeError(exc.strerror)