From b4c327be38e015a6081ab264ce6124f166e65904 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Wed, 18 Feb 2015 04:03:32 -0800 Subject: [PATCH] pylint fixes --- letsencrypt/client/client.py | 2 +- letsencrypt/client/crypto_util.py | 5 ----- letsencrypt/client/revoker.py | 5 +++-- .../client/tests/display/revocation_test.py | 1 + letsencrypt/client/tests/display/util_test.py | 2 +- letsencrypt/client/tests/revoker_test.py | 21 +++++++++++++++---- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index a7e775bcf..01969b748 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -473,7 +473,7 @@ def revoke(config, no_confirm, cert, authkey): elif authkey is not None: revoc.revoke_from_key(le_util.Key(authkey[0], authkey[1])) else: - revoc.display_menu() + revoc.revoke_from_menu() def view_config_changes(config): diff --git a/letsencrypt/client/crypto_util.py b/letsencrypt/client/crypto_util.py index e49173f56..c9bae885e 100644 --- a/letsencrypt/client/crypto_util.py +++ b/letsencrypt/client/crypto_util.py @@ -162,8 +162,3 @@ def make_ss_cert(key_str, domains, not_before=None, # print check_purpose(,0 return m2_cert.as_pem() - -def b64_cert_to_pem(b64_der_cert): - """Convert JOSE Base-64 encoded DER cert to PEM.""" - return M2Crypto.X509.load_cert_der_string( - le_util.jose_b64decode(b64_der_cert)).as_pem() diff --git a/letsencrypt/client/revoker.py b/letsencrypt/client/revoker.py index 76898e533..77f262e6f 100644 --- a/letsencrypt/client/revoker.py +++ b/letsencrypt/client/revoker.py @@ -373,7 +373,8 @@ class Cert(object): self.installed = ["Unknown"] @classmethod - def fromrow(cls, row, backup_dir): # pylint: disable=protected-access + def fromrow(cls, row, backup_dir): + # pylint: disable=protected-access """Initialize Cert from a csv row.""" idx = int(row[0]) backup = Revoker._get_backup(backup_dir, idx, row[1]) @@ -490,4 +491,4 @@ class Cert(object): return "{frame}{cert}{frame}".format(frame=frame, cert=str(self)) def __eq__(self, other): - return self.cert.as_der() == other.cert.as_der() \ No newline at end of file + return self.cert.as_der() == other.cert.as_der() diff --git a/letsencrypt/client/tests/display/revocation_test.py b/letsencrypt/client/tests/display/revocation_test.py index 359e80c5e..4e8591272 100644 --- a/letsencrypt/client/tests/display/revocation_test.py +++ b/letsencrypt/client/tests/display/revocation_test.py @@ -1,3 +1,4 @@ +"""Test :mod:`letsencrypt.client.display.revocation`.""" import os import pkg_resources import sys diff --git a/letsencrypt/client/tests/display/util_test.py b/letsencrypt/client/tests/display/util_test.py index 3a0c78e94..b355f0fc0 100644 --- a/letsencrypt/client/tests/display/util_test.py +++ b/letsencrypt/client/tests/display/util_test.py @@ -1,4 +1,4 @@ -"""Test the display utility.""" +"""Test :mod:`letsencrypt.client.display.util`.""" import os import unittest diff --git a/letsencrypt/client/tests/revoker_test.py b/letsencrypt/client/tests/revoker_test.py index 47b057220..a347970c9 100644 --- a/letsencrypt/client/tests/revoker_test.py +++ b/letsencrypt/client/tests/revoker_test.py @@ -1,3 +1,4 @@ +"""Test :mod:`letsencrypt.client.revoker`.""" import csv import os import pkg_resources @@ -11,7 +12,8 @@ from letsencrypt.client import errors from letsencrypt.client import le_util -class RevokerBase(unittest.TestCase): +class RevokerBase(unittest.TestCase): # pylint: disable=too-few-public-methods + """Base Class for Revoker Tests.""" def setUp(self): self.paths, self.certs, self.key_path = create_revoker_certs() @@ -21,6 +23,7 @@ class RevokerBase(unittest.TestCase): self.list_path = os.path.join(self.backup_dir, "LIST") def _store_certs(self): + # pylint: disable=protected-access from letsencrypt.client.revoker import Revoker Revoker.store_cert_key(self.paths[0], self.key_path, self.mock_config) Revoker.store_cert_key(self.paths[1], self.key_path, self.mock_config) @@ -135,6 +138,7 @@ class RevokerTest(RevokerBase): @mock.patch("letsencrypt.client.revoker.Revoker._acme_revoke") @mock.patch("letsencrypt.client.revoker.logging") def test_safe_revoke_acme_fail(self, mock_log, mock_revoke, mock_display): + # pylint: disable=protected-access mock_revoke.side_effect = errors.LetsEncryptClientError mock_display().confirm_revocation.return_value = True @@ -143,12 +147,14 @@ class RevokerTest(RevokerBase): @mock.patch("letsencrypt.client.revoker.Crypto.PublicKey.RSA.importKey") def test_acme_revoke_failure(self, mock_crypto): + # pylint: disable=protected-access mock_crypto.side_effect = IOError self.assertRaises(errors.LetsEncryptClientError, self.revoker._acme_revoke, self.certs[0]) def test_remove_certs_from_list_bad_certs(self): + # pylint: disable=protected-access from letsencrypt.client.revoker import Cert new_cert = Cert(self.paths[0]) @@ -165,6 +171,7 @@ class RevokerTest(RevokerBase): [new_cert]) def _backups_exist(self, row): + # pylint: disable=protected-access cert_path, key_path = self.revoker._row_to_backup(row) return os.path.isfile(cert_path) and os.path.isfile(key_path) @@ -191,10 +198,12 @@ class RevokerInstallerTest(RevokerBase): return Revoker(installer, self.mock_config) def test_no_installer_get_installed_locations(self): + # pylint: disable=protected-access revoker = self._get_revoker(None) self.assertEqual(revoker._get_installed_locations(), {}) def test_get_installed_locations(self): + # pylint: disable=protected-access mock_installer = mock.MagicMock() mock_installer.get_all_certs_keys.return_value = self.certs_keys @@ -216,6 +225,7 @@ class RevokerInstallerTest(RevokerBase): revoker = self._get_revoker(mock_installer) + # pylint: disable=protected-access self.assertEqual(revoker._get_installed_locations(), {}) class RevokerClassMethodsTest(RevokerBase): @@ -239,6 +249,7 @@ class RevokerClassMethodsTest(RevokerBase): rows = self._get_rows() i = 0 for i, row in enumerate(rows): + # pylint: disable=protected-access self.assertTrue(os.path.isfile( Revoker._get_backup(self.backup_dir, i, self.paths[i]))) self.assertTrue(os.path.isfile( @@ -256,10 +267,11 @@ class RevokerClassMethodsTest(RevokerBase): self.assertEqual( self._get_rows()[3], ["22", self.paths[0], self.key_path]) + # pylint: disable=protected-access self.assertTrue(os.path.isfile( - Revoker._get_backup(self.backup_dir, 22, self.paths[0]))) + Revoker._get_backup(self.backup_dir, 22, self.paths[0]))) self.assertTrue(os.path.isfile( - Revoker._get_backup(self.backup_dir, 22, self.key_path))) + Revoker._get_backup(self.backup_dir, 22, self.key_path))) class CertTest(unittest.TestCase): @@ -303,6 +315,7 @@ class CertTest(unittest.TestCase): self.assertTrue(self.certs[1].pretty_print()) def create_revoker_certs(): + """Create a few revoker.Cert objects.""" from letsencrypt.client.revoker import Cert base_package = "letsencrypt.client.tests" @@ -323,4 +336,4 @@ def create_revoker_certs(): if __name__ == "__main__": - unittest.main() \ No newline at end of file + unittest.main()