From ba8604a3dfa71e267d1cc8e9984ba95dd225163a Mon Sep 17 00:00:00 2001 From: James Kasten Date: Tue, 24 Feb 2015 16:39:26 -0800 Subject: [PATCH] Correctly handle None --- letsencrypt/client/client.py | 2 +- letsencrypt/client/tests/client_test.py | 2 +- letsencrypt/client/tests/display/ops_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index dacb3fdcc..d415403f3 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -381,7 +381,7 @@ def determine_authenticator(all_auths): else: raise errors.LetsEncryptClientError("No Authenticators available.") - if auth and auth in errs: + if auth is not None and auth in errs: logging.error("Please fix the configuration for the Authenticator. " "The following error message was received: " "%s", errs[auth]) diff --git a/letsencrypt/client/tests/client_test.py b/letsencrypt/client/tests/client_test.py index 0246ae77b..5ae6d6107 100644 --- a/letsencrypt/client/tests/client_test.py +++ b/letsencrypt/client/tests/client_test.py @@ -59,7 +59,7 @@ class DetermineAuthenticatorTest(unittest.TestCase): errors.LetsEncryptMisconfigurationError) mock_choose.return_value = self.mock_apache - self.assertEqual(self._call(self.all_auths), None) + self.assertTrue(self._call(self.all_auths) is None) class RollbackTest(unittest.TestCase): diff --git a/letsencrypt/client/tests/display/ops_test.py b/letsencrypt/client/tests/display/ops_test.py index ae4bf419d..11edfe4e3 100644 --- a/letsencrypt/client/tests/display/ops_test.py +++ b/letsencrypt/client/tests/display/ops_test.py @@ -51,7 +51,7 @@ class ChooseAuthenticatorTest(unittest.TestCase): def test_no_choice(self, mock_util): mock_util().menu.return_value = (display_util.CANCEL, 0) - self.assertEqual(self._call(self.auths, {}), None) + self.assertTrue(self._call(self.auths, {}) is None) class GenHttpsNamesTest(unittest.TestCase):