upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

allow instance variable pass-through and lint

Browse source
This commit is contained in:
Erica Portnoy 2018-02-14 14:22:41 -08:00
parent e29ca46422
commit b3c9ec3ae3
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
acme/acme/client.py
View file

@ -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

3
certbot/tests/main_test.py
View file

@ -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')