mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 18:56:55 +02:00
pep8 fixes
This commit is contained in:
+8
-8
@@ -236,7 +236,7 @@ def run(args, config, plugins): # pylint: disable=too-many-branches,too-many-lo
|
|||||||
"You have an existing certificate that contains exactly the "
|
"You have an existing certificate that contains exactly the "
|
||||||
"same domains you requested (ref: {0})\n\nDo you want to "
|
"same domains you requested (ref: {0})\n\nDo you want to "
|
||||||
"renew and replace this certificate with a newly-issued one?"
|
"renew and replace this certificate with a newly-issued one?"
|
||||||
).format(identical_names_cert.configfile.filename)
|
).format(identical_names_cert.configfile.filename)
|
||||||
elif subset_names_cert is not None:
|
elif subset_names_cert is not None:
|
||||||
question = (
|
question = (
|
||||||
"You have an existing certificate that contains a portion of "
|
"You have an existing certificate that contains a portion of "
|
||||||
@@ -244,9 +244,9 @@ def run(args, config, plugins): # pylint: disable=too-many-branches,too-many-lo
|
|||||||
"names: {1}\n\nYou requested these names for the new "
|
"names: {1}\n\nYou requested these names for the new "
|
||||||
"certificate: {2}.\n\nDo you want to replace this existing "
|
"certificate: {2}.\n\nDo you want to replace this existing "
|
||||||
"certificate with the new certificate?"
|
"certificate with the new certificate?"
|
||||||
).format(subset_names_cert.configfile.filename,
|
).format(subset_names_cert.configfile.filename,
|
||||||
", ".join(subset_names_cert.names()),
|
", ".join(subset_names_cert.names()),
|
||||||
", ".join(domains))
|
", ".join(domains))
|
||||||
if question is None:
|
if question is None:
|
||||||
# We aren't in a duplicative-names situation at all, so we don't
|
# We aren't in a duplicative-names situation at all, so we don't
|
||||||
# have to tell or ask the user anything about this.
|
# have to tell or ask the user anything about this.
|
||||||
@@ -256,13 +256,13 @@ def run(args, config, plugins): # pylint: disable=too-many-branches,too-many-lo
|
|||||||
treat_as_renewal = True
|
treat_as_renewal = True
|
||||||
else:
|
else:
|
||||||
reporter_util = zope.component.getUtility(interfaces.IReporter)
|
reporter_util = zope.component.getUtility(interfaces.IReporter)
|
||||||
reporter_util.add_message((
|
reporter_util.add_message(
|
||||||
"To obtain a new certificate that {0} an existing certificate "
|
"To obtain a new certificate that {0} an existing certificate "
|
||||||
"in its domain-name coverage, you must use the --duplicate "
|
"in its domain-name coverage, you must use the --duplicate "
|
||||||
"option.\n\nFor example:\n\n{1} --duplicate {2}").format(
|
"option.\n\nFor example:\n\n{1} --duplicate {2}".format(
|
||||||
"duplicates" if identical_names_cert is not None else
|
"duplicates" if identical_names_cert is not None else
|
||||||
"overlaps with", sys.argv[0], " ".join(sys.argv[1:])),
|
"overlaps with", sys.argv[0], " ".join(sys.argv[1:])),
|
||||||
reporter_util.HIGH_PRIORITY)
|
reporter_util.HIGH_PRIORITY)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
# Attempting to obtain the certificate
|
# Attempting to obtain the certificate
|
||||||
@@ -779,7 +779,7 @@ def _setup_logging(args):
|
|||||||
# TODO: change before release?
|
# TODO: change before release?
|
||||||
log_file_name = os.path.join(args.logs_dir, 'letsencrypt.log')
|
log_file_name = os.path.join(args.logs_dir, 'letsencrypt.log')
|
||||||
file_handler = logging.handlers.RotatingFileHandler(
|
file_handler = logging.handlers.RotatingFileHandler(
|
||||||
log_file_name, maxBytes=2**20, backupCount=10)
|
log_file_name, maxBytes=2 ** 20, backupCount=10)
|
||||||
# rotate on each invocation, rollover only possible when maxBytes
|
# rotate on each invocation, rollover only possible when maxBytes
|
||||||
# is nonzero and backupCount is nonzero, so we set maxBytes as big
|
# is nonzero and backupCount is nonzero, so we set maxBytes as big
|
||||||
# as possible not to overrun in single CLI invocation (1MB).
|
# as possible not to overrun in single CLI invocation (1MB).
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ class BaseRenewableCertTest(unittest.TestCase):
|
|||||||
with open(where, "w") as f:
|
with open(where, "w") as f:
|
||||||
f.write(kind)
|
f.write(kind)
|
||||||
|
|
||||||
|
|
||||||
class RenewableCertTests(BaseRenewableCertTest):
|
class RenewableCertTests(BaseRenewableCertTest):
|
||||||
# pylint: disable=too-many-public-methods
|
# pylint: disable=too-many-public-methods
|
||||||
"""Tests for letsencrypt.renewer.*."""
|
"""Tests for letsencrypt.renewer.*."""
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ fi
|
|||||||
|
|
||||||
cover () {
|
cover () {
|
||||||
if [ "$1" = "letsencrypt" ]; then
|
if [ "$1" = "letsencrypt" ]; then
|
||||||
min=97
|
min=96
|
||||||
elif [ "$1" = "acme" ]; then
|
elif [ "$1" = "acme" ]; then
|
||||||
min=100
|
min=100
|
||||||
elif [ "$1" = "letsencrypt_apache" ]; then
|
elif [ "$1" = "letsencrypt_apache" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user