From 71aa1a5348051487844e69d5ca3a277f8a213817 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 28 May 2015 20:52:59 +0000 Subject: [PATCH] Fix merge problems and pylint --- letsencrypt/cli.py | 4 ++-- letsencrypt/client.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index f2b4f9d4f..bbff3411b 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -288,8 +288,8 @@ def _create_subparsers(parser): # the order of add_subparser() calls is important: it defines the # order in which subparser names will be displayed in --help - parser_run = add_subparser("run", run) - parser_auth = add_subparser("auth", auth) + add_subparser("run", run) + add_subparser("auth", auth) parser_install = add_subparser("install", install) parser_plugins = add_subparser("plugins", plugins_cmd) parser_revoke = add_subparser("revoke", revoke) diff --git a/letsencrypt/client.py b/letsencrypt/client.py index 34a5aefdd..bd467b13d 100644 --- a/letsencrypt/client.py +++ b/letsencrypt/client.py @@ -100,7 +100,7 @@ class Client(object): self.account.save() - def obtain_certificate(self, domains, cert_path, chain_path, csr=None): + def obtain_certificate(self, domains, csr=None): """Obtains a certificate from the ACME server. :meth:`.register` must be called before :meth:`.obtain_certificate` @@ -109,9 +109,6 @@ class Client(object): :param set domains: domains to get a certificate - :param str cert_path: Candidate path to a certificate. - :param str chain_path: Candidate path to a certificate chain. - :param csr: CSR must contain requested domains, the key used to generate this CSR can be different than self.authkey :type csr: :class:`CSR`