Barry Warsaw pushed to branch rename-metadata-key at mailman / Mailman Core
Commits: 15ce97cd by Barry Warsaw at 2017-08-01T11:35:34-04:00 Adjust for Python 3.5/3.6 differences with flake8. Python 3.5 does not like the spaces after the commas. This breaks qa apparently on GL. Locally, with Python 3.6, the spaces are fine since qa doesn't complain here. I wonder why this is happening all of a sudden? Probably a flake8 bug. I suppose this should be reported upstream. :/ - - - - - 2 changed files: - src/mailman/commands/cli_withlist.py - src/mailman/mta/deliver.py Changes: ===================================== src/mailman/commands/cli_withlist.py ===================================== --- a/src/mailman/commands/cli_withlist.py +++ b/src/mailman/commands/cli_withlist.py @@ -80,7 +80,7 @@ def start_python(overrides, banner): # Set the tab completion. with ExitStack() as resources: try: # pragma: nocover - import readline, rlcompleter # noqa: F401, E401 + import readline, rlcompleter # noqa: F401,E401 except ImportError: # pragma: nocover print(_('readline not available'), file=sys.stderr) pass ===================================== src/mailman/mta/deliver.py ===================================== --- a/src/mailman/mta/deliver.py +++ b/src/mailman/mta/deliver.py @@ -90,15 +90,15 @@ def deliver(mlist, msg, msgdata): if size is None: size = len(msg.as_string()) substitutions = dict( - msgid = msg.get('message-id', 'n/a'), # noqa: E221, E251 - listname = mlist.fqdn_listname, # noqa: E221, E251 - sender = original_sender, # noqa: E221, E251 - recip = len(original_recipients), # noqa: E221, E251 - size = size, # noqa: E221, E251 - time = t1 - t0, # noqa: E221, E251 - refused = len(refused), # noqa: E221, E251 - smtpcode = 'n/a', # noqa: E221, E251 - smtpmsg = 'n/a', # noqa: E221, E251 + msgid = msg.get('message-id', 'n/a'), # noqa: E221,E251 + listname = mlist.fqdn_listname, # noqa: E221,E251 + sender = original_sender, # noqa: E221,E251 + recip = len(original_recipients), # noqa: E221,E251 + size = size, # noqa: E221,E251 + time = t1 - t0, # noqa: E221,E251 + refused = len(refused), # noqa: E221,E251 + smtpcode = 'n/a', # noqa: E221,E251 + smtpmsg = 'n/a', # noqa: E221,E251 ) template = config.logging.smtp.every if template.lower() != 'no': @@ -141,9 +141,9 @@ def deliver(mlist, msg, msgdata): template = config.logging.smtp.failure if template.lower() != 'no': substitutions.update( - recip = recipient, # noqa: E221, E251 - smtpcode = code, # noqa: E221, E251 - smtpmsg = smtp_message, # noqa: E221, E251 + recip = recipient, # noqa: E221,E251 + smtpcode = code, # noqa: E221,E251 + smtpmsg = smtp_message, # noqa: E221,E251 ) log.info('%s', expand(template, mlist, substitutions)) # Return the results View it on GitLab: https://gitlab.com/mailman/mailman/commit/15ce97cd60ac097ec402acd7412a325de1db09bc --- View it on GitLab: https://gitlab.com/mailman/mailman/commit/15ce97cd60ac097ec402acd7412a325de1db09bc You're receiving this email because of your account on gitlab.com.
_______________________________________________ Mailman-checkins mailing list Mailman-checkins@python.org Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org