Merge pull request #132 from kuba/pep8

pylint fixes

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