starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into zope.interface

Browse Source 
Conflicts:
	letsencrypt/client/recovery_token_challenge.py
This commit is contained in:
Jakub Warmuz
2014-12-22 01:04:48 +00:00
parent b12614e5e1 580dd952af
commit ce9f4b0849
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/challenge_util.py
+1 -1
View File
@@ -36,7 +36,7 @@ def dvsni_gen_cert(filepath, name, r_b64, nonce, key):
key.pem, [nonce + CONFIG.INVALID_EXT, name, ext]) key.pem, [nonce + CONFIG.INVALID_EXT, name, ext])
with open(filepath, 'w') as chall_cert_file: 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) return le_util.jose_b64encode(dvsni_s)
letsencrypt/scripts/main.py
+1 -1
View File
@@ -201,7 +201,7 @@ def read_file(filename):
""" """
try: try:
return filename, file(filename, 'rU').read() return filename, open(filename, 'rU').read()
except IOError as exc: except IOError as exc:
raise argparse.ArgumentTypeError(exc.strerror) raise argparse.ArgumentTypeError(exc.strerror)