From 1ef21672546a1b739ef8958d9440d686505e9cf6 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 17 Dec 2014 09:14:27 +0100
Subject: [PATCH] pylint fixes

---
 letsencrypt/client/apache_configurator.py            |  4 ----
 letsencrypt/client/challenge_util.py                 |  2 +-
 letsencrypt/client/client.py                         | 12 ++++++------
 letsencrypt/client/recovery_token_challenge.py       |  3 +--
 letsencrypt/client/tests/apache_configurator_test.py |  1 -
 letsencrypt/scripts/main.py                          |  2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/letsencrypt/client/apache_configurator.py b/letsencrypt/client/apache_configurator.py
index 11a999e9b..ad74cab74 100644
--- a/letsencrypt/client/apache_configurator.py
+++ b/letsencrypt/client/apache_configurator.py
@@ -1,5 +1,4 @@
 """Apache Configuration based off of Augeas Configurator."""
-import hashlib
 import logging
 import os
 import pkg_resources
@@ -9,12 +8,9 @@ import socket
 import subprocess
 import sys
 
-from Crypto import Random
-
 from letsencrypt.client import augeas_configurator
 from letsencrypt.client import challenge_util
 from letsencrypt.client import CONFIG
-from letsencrypt.client import crypto_util
 from letsencrypt.client import errors
 from letsencrypt.client import le_util
 
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/client.py b/letsencrypt/client/client.py
index a68d8dd39..af6eb4a5b 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -306,8 +306,8 @@ class Client(object):
                 response = self.send(acme.status_request(response["token"]))
             else:
                 logging.fatal("Received unexpected message")
-                logging.fatal("Expected: %s" % expected)
-                logging.fatal("Received: " + response)
+                logging.fatal("Expected: %s", expected)
+                logging.fatal("Received: %s", response)
                 sys.exit(33)
 
         logging.error(
@@ -364,7 +364,7 @@ class Client(object):
 
         """
         code, tag = display.display_certs(certs)
-        
+
         if code == display.OK:
             cert = certs[tag]
             if display.confirm_revocation(cert):
@@ -494,7 +494,7 @@ class Client(object):
             else:
                 # Handle RecoveryToken type challenges
                 pass
-            
+
             self._assign_responses(resp, indices[i], responses)
 
         logging.info(
@@ -513,10 +513,10 @@ class Client(object):
 
         """
         if isinstance(resp, list):
-            assert(len(resp) == len(index_list))
+            assert len(resp) == len(index_list)
             for j, index in enumerate(index_list):
                 responses[index] = resp[j]
-        else:        
+        else:
             for index in index_list:
                 responses[index] = resp
 
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/client/tests/apache_configurator_test.py b/letsencrypt/client/tests/apache_configurator_test.py
index 08c99cbeb..7f3b2def0 100644
--- a/letsencrypt/client/tests/apache_configurator_test.py
+++ b/letsencrypt/client/tests/apache_configurator_test.py
@@ -3,7 +3,6 @@ import os
 import pkg_resources
 import re
 import shutil
-import sys
 import tempfile
 import unittest
 
diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py
index 8cbda62dc..f829b4939 100755
--- a/letsencrypt/scripts/main.py
+++ b/letsencrypt/scripts/main.py
@@ -116,7 +116,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)