pylint fixes

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
 

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("Expected: %s", expected)
-                logging.fatal("Received: " + response)
+                logging.fatal("Received: %s", response)
                 sys.exit(33)
 
         logging.error(
@@ -513,7 +513,7 @@ 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:

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):

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
 

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)