From f30bf2ca870f1c2d8b3454f537c0a0c100afb783 Mon Sep 17 00:00:00 2001
From: James Kasten <jdkasten@umich.edu>
Date: Sat, 24 Jan 2015 03:31:33 -0800
Subject: [PATCH] pylint cleanup

---
 letsencrypt/client/client.py          | 3 ++-
 letsencrypt/client/tests/main_test.py | 8 ++++----
 letsencrypt/scripts/main.py           | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index 810066b8e..e5b90afba 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -364,7 +364,8 @@ def init_key(key_size):
         key_pem = crypto_util.make_key(key_size)
     except ValueError as err:
         logging.fatal(str(err))
-        logging.info("Note: The default RSA key size is %d bits.", CONFIG.RSA_KEY_SIZE)
+        logging.info("Note: The default RSA key size is %d bits.",
+                     CONFIG.RSA_KEY_SIZE)
         sys.exit(1)
 
     # Save file
diff --git a/letsencrypt/client/tests/main_test.py b/letsencrypt/client/tests/main_test.py
index b4d2ded85..a63bf75f6 100644
--- a/letsencrypt/client/tests/main_test.py
+++ b/letsencrypt/client/tests/main_test.py
@@ -8,9 +8,9 @@ import zope.component
 class RollbackTest(unittest.TestCase):
     """Test the rollback function."""
     def setUp(self):
-       self.m_install = mock.MagicMock()
-       self.m_input = mock.MagicMock()
-       zope.component.getUtility = self.m_input
+        self.m_install = mock.MagicMock()
+        self.m_input = mock.MagicMock()
+        zope.component.getUtility = self.m_input
 
     def _call(self, checkpoints):
         from letsencrypt.scripts.main import rollback
@@ -85,4 +85,4 @@ class RollbackTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/letsencrypt/scripts/main.py b/letsencrypt/scripts/main.py
index 10fff5ae8..9cb8356a7 100755
--- a/letsencrypt/scripts/main.py
+++ b/letsencrypt/scripts/main.py
@@ -41,7 +41,7 @@ def main():
                         help="Revert configuration N number of checkpoints.")
     parser.add_argument("-B", "--keysize", dest="key_size", type=int,
                         default=CONFIG.RSA_KEY_SIZE, metavar="N",
-                        help="RSA key shall be sized N bits. [%d]" % CONFIG.RSA_KEY_SIZE)
+                        help="RSA key shall be sized N bits. [%(default)s]")
     parser.add_argument("-k", "--revoke", dest="revoke", action="store_true",
                         help="Revoke a certificate.")
     parser.add_argument("-v", "--view-config-changes",
@@ -244,7 +244,7 @@ def rollback(checkpoints):
         if not yes:
             logging.info("The error message is above.")
             logging.info(
-                "Configuration was not rolled back.".format(os.linesep))
+                "Configuration was not rolled back.")
             return
 
         logging.info("Rolling back using the Reverter module")