From b3c9ec3ae322bf78fc2823cc0db279feb3ca9fe8 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Wed, 14 Feb 2018 14:22:41 -0800 Subject: [PATCH] allow instance variable pass-through and lint --- acme/acme/client.py | 6 ++++-- certbot/tests/main_test.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index 6dfeeb9f7..dfbe70d89 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -569,7 +569,9 @@ class BackwardsCompatibleClientV2(object): self.client = ClientV2(directory, net=net) def __getattr__(self, name): - if name in dir(ClientBase): + if name in vars(self.client).keys(): + return getattr(self.client, name) + elif name in dir(ClientBase): return getattr(self.client, name) # temporary, for breaking changes into smaller pieces elif name in dir(Client): @@ -597,7 +599,7 @@ class BackwardsCompatibleClientV2(object): def _acme_version_from_directory(self, directory): try: - nonce_field = directory['newNonce'] + nonce_field = directory['newNonce'] # pylint: disable=unused-variable except KeyError: return 1 return 2 diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index 88445b709..3a0073107 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -674,7 +674,8 @@ class MainTest(test_util.ConfigTestCase): # pylint: disable=too-many-public-met ua = "bandersnatch" args += ["--user-agent", ua] self._call_no_clientmock(args) - acme_net.assert_called_once_with(mock.ANY, account=mock.ANY, verify_ssl=True, user_agent=ua) + acme_net.assert_called_once_with(mock.ANY, account=mock.ANY, verify_ssl=True, + user_agent=ua) @mock.patch('certbot.main.plug_sel.record_chosen_plugins') @mock.patch('certbot.main.plug_sel.pick_installer')