starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 19:31:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Peter Eckersley
2016-05-12 17:49:44 -07:00
parent 65c4f77c1e
commit a7d0b1a7d3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/cli.py
+1 -1
View File
@@ -349,7 +349,7 @@ class HelpfulArgumentParser(object):
def set_test_server(self, parsed_args): def set_test_server(self, parsed_args):
"We have --staging/--dry-run; perform sanity check and set config.server" """We have --staging/--dry-run; perform sanity check and set config.server"""
if parsed_args.server not in (flag_default("server"), constants.STAGING_URI): if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):
conflicts = ["--staging"] if parsed_args.staging else [] conflicts = ["--staging"] if parsed_args.staging else []
certbot/crypto_util.py
+3 -3
View File
@@ -178,11 +178,11 @@ def import_csr_file(csrfile, contents):
:param str csrfile: CSR filename :param str csrfile: CSR filename
:param str contents: contens of the CSR file :param str contents: contens of the CSR file
:rtype: tuple
:returns: (le_util.CSR object representing the CSR, :returns: (le_util.CSR object representing the CSR,
OpenSSL FILETYPE_ representing DER or PEM, `OpenSSL.crypto.FILETYPE_PEM` or `OpenSSL.crypto.FILETYPE_ASN1`,
list of domains requested in the CSR) list of domains requested in the CSR)
:rtype: tuple
""" """
try: try:
csr = le_util.CSR(file=csrfile, data=contents, form="der") csr = le_util.CSR(file=csrfile, data=contents, form="der")