Merge branch 'master' into zope.interface

Conflicts:
	letsencrypt/client/recovery_token_challenge.py

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)
 

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)