Cleaned up multiline statements

This commit is contained in:
Brad Warren
2015-06-24 11:51:50 -07:00
parent 512e02c837
commit 8f760cf828
+5 -7
View File
@@ -489,8 +489,7 @@ def is_preferred(offered_challb, satisfied,
_ERROR_HELP_COMMON = ( _ERROR_HELP_COMMON = (
'To fix these errors, please make sure that your domain name was entered ' 'To fix these errors, please make sure that your domain name was entered '
'correctly and the DNS A/AAAA record(s) for that domain contains the ' 'correctly and the DNS A/AAAA record(s) for that domain contains the '
'right IP address.' 'right IP address.')
)
_ERROR_HELP = { _ERROR_HELP = {
@@ -515,8 +514,7 @@ _ERROR_HELP = {
'unauthorized' : _ERROR_HELP_COMMON, 'unauthorized' : _ERROR_HELP_COMMON,
'unknownHost' : 'unknownHost' :
'To fix these errors, please make sure that your domain name was ' 'To fix these errors, please make sure that your domain name was '
'entered correctly.', 'entered correctly.',}
}
def _report_failed_challs(failed_achalls): def _report_failed_challs(failed_achalls):
@@ -533,7 +531,8 @@ def _report_failed_challs(failed_achalls):
reporter = zope.component.getUtility(interfaces.IReporter) reporter = zope.component.getUtility(interfaces.IReporter)
for achalls in problems.itervalues(): for achalls in problems.itervalues():
reporter.add_message(_generate_failed_chall_msg(achalls), 1, True) reporter.add_message(
_generate_failed_chall_msg(achalls), reporter.MEDIUM_PRIORITY, True)
def _generate_failed_chall_msg(failed_achalls): def _generate_failed_chall_msg(failed_achalls):
@@ -549,8 +548,7 @@ def _generate_failed_chall_msg(failed_achalls):
""" """
typ = failed_achalls[0].error.typ typ = failed_achalls[0].error.typ
msg = [ msg = [
'The following \'{0}\' errors were reported by the server:'.format(typ) "The following '{0}' errors were reported by the server:".format(typ)]
]
problems = dict() problems = dict()
for achall in failed_achalls: for achall in failed_achalls: