upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 07:42:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge problems and pylint

Browse source
This commit is contained in:
Jakub Warmuz 2015-05-28 20:52:59 +00:00
parent eef1ce6cf5
commit 71aa1a5348
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
letsencrypt/cli.py
View file

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

5
letsencrypt/client.py
View file

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